From b451719e07a0bc10ae879a0959483b4ac2ff7017 Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Wed, 10 May 2006 18:00:16 +0000
Subject: [PATCH] simplify, amr.c sets frame_size to 160, and sample size is
always 8000
Originally committed as revision 5359 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/movenc.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 684a37790ea..26ee17115f7 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1425,17 +1425,9 @@ static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,
if(mov->tracks[i].enc->codec_type == CODEC_TYPE_VIDEO) {
mov->tracks[i].timescale = mov->tracks[i].enc->time_base.den;
mov->tracks[i].sampleDuration = mov->tracks[i].enc->time_base.num;
- }
- else if(mov->tracks[i].enc->codec_type == CODEC_TYPE_AUDIO) {
- /* If AMR, track timescale = 8000, AMR_WB = 16000 */
- if(mov->tracks[i].enc->codec_id == CODEC_ID_AMR_NB) {
- mov->tracks[i].sampleDuration = 160; // Bytes per chunk
- mov->tracks[i].timescale = 8000;
- }
- else {
- mov->tracks[i].timescale = mov->tracks[i].enc->sample_rate;
- mov->tracks[i].sampleDuration = mov->tracks[i].enc->frame_size;
- }
+ } else if(mov->tracks[i].enc->codec_type == CODEC_TYPE_AUDIO) {
+ mov->tracks[i].timescale = mov->tracks[i].enc->sample_rate;
+ mov->tracks[i].sampleDuration = mov->tracks[i].enc->frame_size;
}
mov->tracks[i].trackDuration =
--
GitLab