virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avcodec/dca_parser: avoid use of magic values

Browse Source 
Duration computation can be simplified because number of PCM blocks is
only allowed to be a multiple of 8.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
foo86 2017-07-10 17:11:38 +03:00 committed by James Almer
parent 4b6c212e85
commit 07a7f08b1e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/dca_parser.c
View File

@ -25,6 +25,7 @@
#include "dca.h" #include "dca.h"
#include "dca_core.h" #include "dca_core.h"
#include "dca_exss.h" #include "dca_exss.h"
#include "dca_lbr.h"
#include "dca_syncwords.h" #include "dca_syncwords.h"
#include "get_bits.h" #include "get_bits.h"
#include "parser.h" #include "parser.h"
@ -214,9 +215,9 @@ static int dca_parse_params(DCAParseContext *pc1, const uint8_t *buf,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
switch (get_bits(&gb, 8)) { switch (get_bits(&gb, 8)) {
case 2: case DCA_LBR_HEADER_DECODER_INIT:
pc1->sr_code = get_bits(&gb, 8); pc1->sr_code = get_bits(&gb, 8);
case 1: case DCA_LBR_HEADER_SYNC_ONLY:
break; break;
default: default:
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -267,7 +268,7 @@ static int dca_parse_params(DCAParseContext *pc1, const uint8_t *buf,
if (avpriv_dca_parse_core_frame_header(&gb, &h) < 0) if (avpriv_dca_parse_core_frame_header(&gb, &h) < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
*duration = 256 * (h.npcmblocks / 8); *duration = h.npcmblocks * DCA_PCMBLOCK_SAMPLES;
*sample_rate = avpriv_dca_sample_rates[h.sr_code]; *sample_rate = avpriv_dca_sample_rates[h.sr_code];
if (*profile != FF_PROFILE_UNKNOWN) if (*profile != FF_PROFILE_UNKNOWN)
return 0; return 0;