aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stebbins <stebbins@jetheaddev.com>2011-07-04 09:55:19 -0700
committerAnton Khirnov <anton@khirnov.net>2011-09-11 12:22:51 +0200
commit0ab69793fc76b0653315b055fbfae4738a40d115 (patch)
tree58bbc3e622091b80c677177b1cc706d689947b66
parentfa38ed8ac07402d9ab268eee0eb475e7e473a0c3 (diff)
downloadffmpeg-0ab69793fc76b0653315b055fbfae4738a40d115.tar.gz
dca: set AVCodecContext frame_size for DTS audio
Set the frame size when decoding DTS audio. This has the side effect of fixing the computation of timestamps for DTS-HD in compute_pkt_fields. Since frame_size is not currently set, the duration of a frame is being guessed based on the streams bitrate. But for DTS-HD, the bitrate currently used is the rate of the DTS core which is much different than the whole DTS-HD stream and leads to a wildly inaccurate frame duration estimate. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 49c7006c7e815d4330247624a9e6ba30e288cd02) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/dca.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index a9b2c9b0c9..fad6bce7a9 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1650,6 +1650,7 @@ static int dca_decode_frame(AVCodecContext * avctx,
//set AVCodec values with parsed data
avctx->sample_rate = s->sample_rate;
avctx->bit_rate = s->bit_rate;
+ avctx->frame_size = s->sample_blocks * 32;
s->profile = FF_PROFILE_DTS;