scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 17:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

typo: 3d->interleaved -> 3d-interlaced

Browse Source
This commit is contained in:
Martin Pulec
2011-12-23 13:32:10 +01:00
parent 98f8e8455a
commit bfae980c79
5 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ultragrid/Makefile.in
View File

@@ -75,7 +75,7 @@ OBJS = src/bitstream.o \
src/video_display.o \
src/video_display/null.o \
src/vo_postprocess.o \
src/vo_postprocess/3d-interleaved.o \
src/vo_postprocess/3d-interlaced.o \
src/vo_postprocess/split.o \
@DELTACAST_OBJ@ \
@DVS_OBJ@ \

8
ultragrid/src/main.c
View File

@@ -876,16 +876,16 @@ int main(int argc, char *argv[])
}
/* following block only shows help (otherwise initialized in receiver thread */
if((uv->postprocess && strcmp(uv->postprocess, "help") == 0) ||
(uv->decoder_mode && strcmp(uv->decoder_mode, "help") == 0)) {
if((uv->postprocess && strstr(uv->postprocess, "help") != NULL) ||
(uv->decoder_mode && strstr(uv->decoder_mode, "help") != NULL)) {
struct state_decoder *dec = decoder_init(uv->decoder_mode, uv->postprocess);
decoder_destroy(dec);
exit_status = EXIT_SUCCESS;
goto cleanup;
}
/* following block only shows help (otherwise initialized in sender thread */
if(uv->requested_compression && strcmp(uv->compress_options,"help") == 0) {
struct compress_state *compression = compress_init("help");
if(uv->requested_compression && strstr(uv->compress_options,"help") != NULL) {
struct compress_state *compression = compress_init(uv->compress_options);
compress_done(compression);
exit_status = EXIT_SUCCESS;
goto cleanup;

8
ultragrid/src/vo_postprocess.c
View File

@@ -53,7 +53,7 @@
#include <stdint.h>
#include <string.h>
#include "vo_postprocess.h"
#include "vo_postprocess/3d-interleaved.h"
#include "vo_postprocess/3d-interlaced.h"
#include "vo_postprocess/split.h"
struct vo_postprocess_t {
@@ -71,9 +71,9 @@ struct vo_postprocess_state {
};
const struct vo_postprocess_t vo_postprocess_modules[] = {
{"3d-interleaved", interleaved_3d_init, interleaved_3d_postprocess_reconfigure,
interleaved_3d_get_out_desc,
interleaved_3d_postprocess, interleaved_3d_done },
{"3d-interlaced", interlaced_3d_init, interlaced_3d_postprocess_reconfigure,
interlaced_3d_get_out_desc,
interlaced_3d_postprocess, interlaced_3d_done },
{"split", split_init, split_postprocess_reconfigure,
split_get_out_desc,
split_postprocess, split_done },

33
ultragrid/src/vo_postprocess/3d-interleaved.c → ultragrid/src/vo_postprocess/3d-interlaced.c
View File

@@ -53,26 +53,29 @@
#include "video_display.h" /* DISPLAY_PROPERTY_VIDEO_SEPARATE_FILES */
#include <pthread.h>
#include <stdlib.h>
#include "vo_postprocess/3d-interleaved.h"
#include "vo_postprocess/3d-interlaced.h"
struct state_interleaved_3d {
struct state_interlaced_3d {
struct video_frame *in;
};
void * interleaved_3d_init(char *config) {
struct state_interleaved_3d *s;
UNUSED(config);
void * interlaced_3d_init(char *config) {
struct state_interlaced_3d *s;
s = (struct state_interleaved_3d *)
malloc(sizeof(struct state_interleaved_3d));
if(config && strcmp(config, "help") == 0) {
printf("3d-interlaced takes no parameters.\n");
return NULL;
}
s = (struct state_interlaced_3d *)
malloc(sizeof(struct state_interlaced_3d));
s->in = vf_alloc(2);
return s;
}
struct video_frame * interleaved_3d_postprocess_reconfigure(void *state, struct video_desc desc)
struct video_frame * interlaced_3d_postprocess_reconfigure(void *state, struct video_desc desc)
{
struct state_interleaved_3d *s = (struct state_interleaved_3d *) state;
struct state_interlaced_3d *s = (struct state_interlaced_3d *) state;
assert(desc.tile_count == 2);
@@ -93,7 +96,7 @@ struct video_frame * interleaved_3d_postprocess_reconfigure(void *state, struct
return s->in;
}
void interleaved_3d_postprocess(void *state, struct video_frame *in, struct video_frame *out, int req_pitch)
void interlaced_3d_postprocess(void *state, struct video_frame *in, struct video_frame *out, int req_pitch)
{
int x;
@@ -102,7 +105,7 @@ void interleaved_3d_postprocess(void *state, struct video_frame *in, struct vide
/* we compute avg from line k/2*2 and k/2*2+1 for left eye and put
* to (k/2*2)th line. Than we compute avg of same lines number
* and put it to the following line, which creates interleaved stereo */
* and put it to the following line, which creates interlaced stereo */
for (x = 0; x < vf_get_tile(out, 0)->height; ++x) {
int linepos;
char *line1 = vf_get_tile(in, x % 2)->data + (x / 2) * 2 * linesize;
@@ -123,9 +126,9 @@ void interleaved_3d_postprocess(void *state, struct video_frame *in, struct vide
}
}
void interleaved_3d_done(void *state)
void interlaced_3d_done(void *state)
{
struct state_interleaved_3d *s = (struct state_interleaved_3d *) state;
struct state_interlaced_3d *s = (struct state_interlaced_3d *) state;
free(vf_get_tile(s->in, 0)->data);
free(vf_get_tile(s->in, 1)->data);
@@ -133,9 +136,9 @@ void interleaved_3d_done(void *state)
free(state);
}
void interleaved_3d_get_out_desc(void *state, struct video_desc *out, int *in_display_mode)
void interlaced_3d_get_out_desc(void *state, struct video_desc *out, int *in_display_mode)
{
struct state_interleaved_3d *s = (struct state_interleaved_3d *) state;
struct state_interlaced_3d *s = (struct state_interlaced_3d *) state;
out->width = vf_get_tile(s->in, 0)->width; /* not *2 !!!!!!*/
out->height = vf_get_tile(s->in, 0)->height;

10
ultragrid/src/vo_postprocess/3d-interleaved.h → ultragrid/src/vo_postprocess/3d-interlaced.h
View File

@@ -47,9 +47,9 @@
#include "video_codec.h"
void * interleaved_3d_init(char *config);
struct video_frame * interleaved_3d_postprocess_reconfigure(void *state, struct video_desc desc);
void interleaved_3d_get_out_desc(void *state, struct video_desc *out, int *display_mode);
void interleaved_3d_postprocess(void *state, struct video_frame *in, struct video_frame *out, int req_pitch);
void interleaved_3d_done(void *state);
void * interlaced_3d_init(char *config);
struct video_frame * interlaced_3d_postprocess_reconfigure(void *state, struct video_desc desc);
void interlaced_3d_get_out_desc(void *state, struct video_desc *out, int *display_mode);
void interlaced_3d_postprocess(void *state, struct video_frame *in, struct video_frame *out, int req_pitch);
void interlaced_3d_done(void *state);