virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  dcadec: Add some logging before returning on error

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-30 21:08:47 +01:00
commit a3b9f53d7b
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/dcadec.c
View File

@ -326,6 +326,8 @@ static const int8_t dca_channel_reorder_nolfe_xch[][9] = {
#define DCA_BUFFER_PADDING_SIZE 1024 #define DCA_BUFFER_PADDING_SIZE 1024
#define DCA_NSYNCAUX 0x9A1105A0
/** Bit allocation */ /** Bit allocation */
typedef struct { typedef struct {
int offset; ///< code values offset int offset; ///< code values offset
@ -1444,6 +1446,7 @@ static int dca_filter_channels(DCAContext *s, int block_index)
static int dca_subframe_footer(DCAContext *s, int base_channel) static int dca_subframe_footer(DCAContext *s, int base_channel)
{ {
int in, out, aux_data_count, aux_data_end, reserved; int in, out, aux_data_count, aux_data_end, reserved;
uint32_t nsyncaux;
/* /*
* Unpack optional information * Unpack optional information
@ -1462,8 +1465,9 @@ static int dca_subframe_footer(DCAContext *s, int base_channel)
aux_data_end = 8 * aux_data_count + get_bits_count(&s->gb); aux_data_end = 8 * aux_data_count + get_bits_count(&s->gb);
if (get_bits_long(&s->gb, 32) != 0x9A1105A0) { // nSYNCAUX if ((nsyncaux = get_bits_long(&s->gb, 32)) != DCA_NSYNCAUX) {
av_log(s->avctx,AV_LOG_ERROR, "nSYNCAUX mismatching\n"); av_log(s->avctx, AV_LOG_ERROR, "nSYNCAUX mismatch %#"PRIx32"\n",
nsyncaux);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -1477,7 +1481,8 @@ static int dca_subframe_footer(DCAContext *s, int base_channel)
} }
if ((s->core_downmix = get_bits1(&s->gb))) { if ((s->core_downmix = get_bits1(&s->gb))) {
switch (get_bits(&s->gb, 3)) { int am = get_bits(&s->gb, 3);
switch (am) {
case 0: case 0:
s->core_downmix_amode = DCA_MONO; s->core_downmix_amode = DCA_MONO;
break; break;
@ -1500,13 +1505,20 @@ static int dca_subframe_footer(DCAContext *s, int base_channel)
s->core_downmix_amode = DCA_3F1R; s->core_downmix_amode = DCA_3F1R;
break; break;
default: default:
av_log(s->avctx, AV_LOG_ERROR,
"Invalid mode %d for embedded downmix coefficients\n",
am);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for (out = 0; out < dca_channels[s->core_downmix_amode]; out++) { for (out = 0; out < dca_channels[s->core_downmix_amode]; out++) {
for (in = 0; in < s->prim_channels + !!s->lfe; in++) { for (in = 0; in < s->prim_channels + !!s->lfe; in++) {
uint16_t tmp = get_bits(&s->gb, 9); uint16_t tmp = get_bits(&s->gb, 9);
if ((tmp & 0xFF) > 241) if ((tmp & 0xFF) > 241) {
av_log(s->avctx, AV_LOG_ERROR,
"Invalid downmix coefficient code %"PRIu16"\n",
tmp);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
s->core_downmix_codes[in][out] = tmp; s->core_downmix_codes[in][out] = tmp;
} }
} }
@ -1517,7 +1529,8 @@ static int dca_subframe_footer(DCAContext *s, int base_channel)
// additional data (reserved, cf. ETSI TS 102 114 V1.4.1) // additional data (reserved, cf. ETSI TS 102 114 V1.4.1)
if ((reserved = (aux_data_end - get_bits_count(&s->gb))) < 0) { if ((reserved = (aux_data_end - get_bits_count(&s->gb))) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "overread aux by %d bits\n", -reserved); av_log(s->avctx, AV_LOG_ERROR,
"Overread auxiliary data by %d bits\n", -reserved);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if (reserved) { } else if (reserved) {
avpriv_request_sample(s->avctx, avpriv_request_sample(s->avctx,