[FFmpeg-cvslog] lavd/alsa: preliminary support of uncoded frame.
Nicolas George
git at videolan.org
Wed Feb 12 00:59:16 CET 2014
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Tue Dec 31 14:09:15 2013 +0100| [62106fcc23cf52f8e44be572b58c3bb50f598763] | committer: Nicolas George
lavd/alsa: preliminary support of uncoded frame.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62106fcc23cf52f8e44be572b58c3bb50f598763
---
libavdevice/alsa-audio-enc.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c
index 83e1d2f..bf56fc4 100644
--- a/libavdevice/alsa-audio-enc.c
+++ b/libavdevice/alsa-audio-enc.c
@@ -113,6 +113,24 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
return 0;
}
+static int audio_write_frame(AVFormatContext *s1, int stream_index,
+ AVFrame **frame, unsigned flags)
+{
+ AlsaData *s = s1->priv_data;
+ AVPacket pkt;
+
+ /* ff_alsa_open() should have accepted only supported formats */
+ if ((flags & AV_WRITE_UNCODED_FRAME_QUERY))
+ return av_sample_fmt_is_planar(s1->streams[stream_index]->codec->sample_fmt) ?
+ AVERROR(EINVAL) : 0;
+ /* set only used fields */
+ pkt.data = (*frame)->data[0];
+ pkt.size = (*frame)->nb_samples * s->frame_size;
+ pkt.dts = (*frame)->pkt_dts;
+ pkt.duration = av_frame_get_pkt_duration(*frame);
+ return audio_write_packet(s1, &pkt);
+}
+
static void
audio_get_output_timestamp(AVFormatContext *s1, int stream,
int64_t *dts, int64_t *wall)
@@ -133,6 +151,7 @@ AVOutputFormat ff_alsa_muxer = {
.write_header = audio_write_header,
.write_packet = audio_write_packet,
.write_trailer = ff_alsa_close,
+ .write_uncoded_frame = audio_write_frame,
.get_output_timestamp = audio_get_output_timestamp,
.flags = AVFMT_NOFILE,
};
More information about the ffmpeg-cvslog
mailing list