scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 12:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrected FourCC handling

Browse Source
This commit is contained in:
Martin Pulec
2012-09-05 18:16:17 +02:00
parent 77d5d00d49
commit b14d70172c
4 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rtp/decoders.c
View File

@@ -428,7 +428,7 @@ after_linedecoder_lookup:
after_decoder_lookup:
if(decoder->decoder_type == UNSET) {
fprintf(stderr, "Unable to find decoder for input codec!!!\n");
fprintf(stderr, "Unable to find decoder for input codec \"%s\"!!!\n", get_codec_name(desc.color_spec));
exit_uv(128);
return (codec_t) -1;
}
@@ -740,7 +740,10 @@ static int check_for_mode_change(struct state_decoder *decoder, uint32_t *hdr, s
width = ntohl(hdr[3]) >> 16;
height = ntohl(hdr[3]) & 0xffff;
color_spec = get_codec_from_fcc(ntohl(hdr[4]));
color_spec = get_codec_from_fcc(hdr[4]);
if(color_spec == (codec_t) -1) {
fprintf(stderr, "Unknown FourCC \"%4s\"!\n", (char *) &hdr[4]);
}
tmp = ntohl(hdr[5]);
interlacing = (enum interlacing_t) (tmp >> 29);
@@ -1161,7 +1164,7 @@ int decode_frame(struct coded_data *cdata, void *decode_data)
}
for (i = 1; i < decoder->pp_output_frames_count; ++i) {
display_put_frame(decoder->display, (char *) frame);
display_put_frame(decoder->display, frame);
frame = display_get_frame(decoder->display);
pp_ret = vo_postprocess(decoder->postprocess,
NULL,

2
src/transmit.c
View File

@@ -292,7 +292,7 @@ tx_send_base(struct tx *tx, struct tile *tile, struct rtp *rtp_session,
pos = 0;
video_hdr[3] = htonl(tile->width << 16 | tile->height);
video_hdr[4] = htonl(get_fourcc(color_spec));
video_hdr[4] = get_fourcc(color_spec);
video_hdr[2] = htonl(data_to_send_len);
tmp = substream << 22;
tmp |= 0x3fffff & tx->buffer;

44
src/video_codec.c
View File

@@ -57,25 +57,25 @@
#include <string.h>
#include "video_codec.h"
#define to_fourcc(a,b,c,d) (((a)<<24) | ((b)<<16) | ((c)<<8) | (d))
#define to_fourcc(a,b,c,d) (((uint32_t)(a)) | ((uint32_t)(b)<<8) | ((uint32_t)(c)<<16) | ((uint32_t)(d)<<24))
static int get_halign(codec_t codec);
static void vc_deinterlace_aligned(unsigned char *src, long src_linesize, int lines);
static void vc_deinterlace_unaligned(unsigned char *src, long src_linesize, int lines);
const struct codec_info_t codec_info[] = {
{RGBA, "RGBA", 0x41424752, 1, 4.0, TRUE, FALSE},
{UYVY, "UYVY", 846624121, 1, 2, FALSE, FALSE},
{YUYV, "YUYV", to_fourcc('Y', 'U', 'Y', 'V'), 1, 2, FALSE, FALSE},
{RGBA, "RGBA", to_fourcc('R','G','B','A'), 1, 4.0, TRUE, FALSE},
{UYVY, "UYVY", to_fourcc('2','v','u','y'), 1, 2, FALSE, FALSE},
{YUYV, "YUYV", to_fourcc('Y','U','Y','V'), 1, 2, FALSE, FALSE},
{Vuy2, "2vuy", to_fourcc('2','V','u','y'), 1, 2, FALSE, FALSE},
{DVS8, "DVS8", to_fourcc('D','V','S','8'), 1, 2, FALSE, FALSE},
{R10k, "R10k", 1378955371, 1, 4, TRUE, FALSE},
{v210, "v210", 1983000880, 48, 8.0 / 3.0, FALSE, FALSE},
{DVS8, "DVS8", to_fourcc('d','v','s','8'), 1, 2, FALSE, FALSE},
{R10k, "R10k", to_fourcc('R','1','0','k'), 1, 4, TRUE, FALSE},
{v210, "v210", to_fourcc('v','2','1','0'), 48, 8.0 / 3.0, FALSE, FALSE},
{DVS10, "DVS10", to_fourcc('D','S','1','0'), 48, 8.0 / 3.0, FALSE, FALSE},
{DXT1, "DXT1", to_fourcc('D','X','T','1'), 1, 0.5, TRUE, TRUE},
{DXT1_YUV, "DXT1 YUV", to_fourcc('D','X','T','Y'), 1, 0.5, FALSE, TRUE}, /* packet YCbCr inside DXT1 channels */
{DXT5, "DXT5", to_fourcc('D','X','T','5'), 1, 1.0, FALSE, TRUE},/* DXT5 YCoCg */
{RGB, "RGB", 0x32424752, 1, 3.0, TRUE, FALSE},
{RGB, "RGB", to_fourcc('R','G','B','2'), 1, 3.0, TRUE, FALSE},
{DPX10, "DPX10", to_fourcc('D','P','1','0'), 1, 4.0, TRUE, FALSE},
{JPEG, "JPEG", to_fourcc('J','P','E','G'), 0, 0.0, FALSE, TRUE},
{RAW, "raw", to_fourcc('r','a','w','s'), 0, 1.0, FALSE, TRUE}, /* raw SDI */
@@ -103,8 +103,20 @@ const struct line_decode_from_to line_decoders[] = {
{ (codec_t) 0, (codec_t) 0, NULL }
};
struct alternate_fourcc {
uint32_t alias;
uint32_t primary_fcc;
};
const struct alternate_fourcc fourcc_aliases[] = {
{to_fourcc('M', 'J', 'P', 'G'), to_fourcc('J', 'P', 'E', 'G')}
// the following two are here because it was sent with wrong endiannes in past
{to_fourcc('A', 'B', 'G', 'R'), to_fourcc('R', 'G', 'B', 'A')},
{to_fourcc('2', 'B', 'G', 'R'), to_fourcc('R', 'G', 'B', '2')},
// following ones are rather for further compatibility (proposed codecs rename)
{to_fourcc('U', 'Y', 'V', 'Y'), to_fourcc('2', 'v', 'u', 'y')},
{to_fourcc('M', 'J', 'P', 'G'), to_fourcc('J', 'P', 'E', 'G')},
{to_fourcc('D', 'V', 'S', '8'), to_fourcc('d', 'v', 's', '8')},
{0,0}
};
void show_codec_help(char *module)
@@ -172,6 +184,20 @@ codec_t get_codec_from_fcc(uint32_t fourcc)
return codec_info[i].codec;
i++;
}
// try to look through aliases
i = 0;
while (fourcc_aliases[i].alias != 0) {
if (fourcc == fourcc_aliases[i].alias) {
int j = 0;
while (codec_info[j].name != NULL) {
if (fourcc_aliases[i].primary_fcc == codec_info[j].fcc)
return codec_info[j].codec;
j++;
}
}
i++;
}
return (codec_t) -1;
}

7
src/video_codec.h
View File

@@ -68,11 +68,6 @@ struct codec_info_t {
unsigned opaque:1;
};
struct alternate_fourcc {
uint32_t primary_fcc;
uint32_t alias;
};
struct line_decode_from_to {
codec_t from;
codec_t to;
@@ -82,8 +77,6 @@ struct line_decode_from_to {
extern const struct codec_info_t codec_info[]; /* defined int .c */
extern const struct line_decode_from_to line_decoders[]; /* defined int .c */
extern const struct alternate_fourcc fourcc_aliases[]; /* defined int .c */
void show_codec_help(char *mode);
double get_bpp(codec_t codec);
uint32_t get_fourcc(codec_t codec);