highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/sonic: add larger version and minor_version fields with version >= 2

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-10 15:54:30 +01:00
parent 4c32629b82
commit c61daa68e4
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/sonic.c
View File

@ -46,6 +46,7 @@
typedef struct SonicContext { typedef struct SonicContext {
int version; int version;
int minor_version;
int lossless, decorrelation; int lossless, decorrelation;
int num_taps, downsampling; int num_taps, downsampling;
@ -573,8 +574,12 @@ static av_cold int sonic_encode_init(AVCodecContext *avctx)
init_put_bits(&pb, avctx->extradata, 16*8); init_put_bits(&pb, avctx->extradata, 16*8);
put_bits(&pb, 2, s->version); // version put_bits(&pb, 2, s->version); // version
if (s->version == 1) if (s->version >= 1)
{ {
if (s->version >= 2) {
put_bits(&pb, 8, s->version);
put_bits(&pb, 8, s->minor_version);
}
put_bits(&pb, 2, s->channels); put_bits(&pb, 2, s->channels);
put_bits(&pb, 4, code_samplerate(s->samplerate)); put_bits(&pb, 4, code_samplerate(s->samplerate));
} }
@ -589,8 +594,8 @@ static av_cold int sonic_encode_init(AVCodecContext *avctx)
flush_put_bits(&pb); flush_put_bits(&pb);
avctx->extradata_size = put_bits_count(&pb)/8; avctx->extradata_size = put_bits_count(&pb)/8;
av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n", av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d.%d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n",
s->version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling); s->version, s->minor_version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling);
avctx->frame_size = s->block_align*s->downsampling; avctx->frame_size = s->block_align*s->downsampling;
@ -762,13 +767,17 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
init_get_bits8(&gb, avctx->extradata, avctx->extradata_size); init_get_bits8(&gb, avctx->extradata, avctx->extradata_size);
s->version = get_bits(&gb, 2); s->version = get_bits(&gb, 2);
if (s->version > 1) if (s->version >= 2) {
s->version = get_bits(&gb, 8);
s->minor_version = get_bits(&gb, 8);
}
if (s->version > 2)
{ {
av_log(avctx, AV_LOG_ERROR, "Unsupported Sonic version, please report\n"); av_log(avctx, AV_LOG_ERROR, "Unsupported Sonic version, please report\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (s->version == 1) if (s->version >= 1)
{ {
s->channels = get_bits(&gb, 2); s->channels = get_bits(&gb, 2);
s->samplerate = samplerate_table[get_bits(&gb, 4)]; s->samplerate = samplerate_table[get_bits(&gb, 4)];
@ -805,8 +814,8 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
s->frame_size = s->channels*s->block_align*s->downsampling; s->frame_size = s->channels*s->block_align*s->downsampling;
// avctx->frame_size = s->block_align; // avctx->frame_size = s->block_align;
av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n", av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d.%d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n",
s->version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling); s->version, s->minor_version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling);
// generate taps // generate taps
s->tap_quant = av_calloc(s->num_taps, sizeof(*s->tap_quant)); s->tap_quant = av_calloc(s->num_taps, sizeof(*s->tap_quant));