projects
/
platform
/
upstream
/
gst-libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3d1cfe
)
ffmpeg: add default frame_size for g726
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 17 Apr 2009 14:25:12 +0000
(16:25 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 17 Apr 2009 14:27:09 +0000
(16:27 +0200)
Without a frame_size configured in the context, the ffmpeg encoders do nothing.
Since the G726 does not configure a size itself, we set ourselves a frame_size
that corresponds to 20ms of audio, which is a reasonable default.
ext/ffmpeg/gstffmpegcodecmap.c
patch
|
blob
|
history
diff --git
a/ext/ffmpeg/gstffmpegcodecmap.c
b/ext/ffmpeg/gstffmpegcodecmap.c
index
269d503
..
88d96ec
100644
(file)
--- a/
ext/ffmpeg/gstffmpegcodecmap.c
+++ b/
ext/ffmpeg/gstffmpegcodecmap.c
@@
-1236,6
+1236,9
@@
gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break;
case CODEC_ID_ADPCM_G726:
layout = "g726";
+ if (context)
+ /* get a default 20ms packet size */
+ context->frame_size = context->sample_rate / 50;
break;
case CODEC_ID_ADPCM_CT:
layout = "ct";
@@
-2264,6
+2267,8
@@
gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
break;
}
}
+ case CODEC_ID_ADPCM_G726:
+ break;
default:
break;
}