[FFmpeg-devel] [RFC/PATCH] WAV muxer: add RF64 support

[Daniel Verkamp]

On Tue, Feb 12, 2013 at 8:06 AM, Paul B Mahol <onemda at gmail.com> wrote:
> On 1/31/13, Daniel Verkamp <daniel at drv.nu> wrote:
>> On Tue, Jan 29, 2013 at 4:04 AM, Paul B Mahol <onemda at gmail.com> wrote:
>>> On 1/23/13, Daniel Verkamp <daniel at drv.nu> wrote:
>>>> ---
>>>>  libavformat/wavenc.c | 65
>>>> +++++++++++++++++++++++++++++++++++++++++++++++-----
>>>>  1 file changed, 59 insertions(+), 6 deletions(-)
>>>>
>>>
>>> [...]
>>>
>>> Missing copyright update.
>>
>> Updates:
>> - changed to a single -rf64 option with named options "auto"
>> (default), "always", and "never"; other bikeshed colors welcome...
>> - updated test refs (since -rf64 auto is default in this version of
>> the patch, this hits every test that uses the wav muxer)
>> - added copyright notice
>>
>> Still needs Changelog/version bump.
>
> applied, with default set to never - this can be changed at anytime,
> but please make sure that change and fate updates are part of same
> commit.
>

Thanks, that sounds reasonable - here is a cosmetics patch to reindent.

-- Daniel
-------------- next part --------------
From 99a5d0730aa8fb419503fdbdf5ad1817f8c1833f Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel at drv.nu>
Date: Tue, 12 Feb 2013 09:36:01 -0700
Subject: [PATCH] WAV muxer: reindent

---
 libavformat/wavenc.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index ba902c9..fea38cf 100644
--- a/libavformat/wavenc.c
+++ b/libavformat/wavenc.c
@@ -120,8 +120,8 @@ static int wav_write_header(AVFormatContext *s)
         ffio_wfourcc(pb, "RF64");
         avio_wl32(pb, -1); /* RF64 chunk size: use size in ds64 */
     } else {
-    ffio_wfourcc(pb, "RIFF");
-    avio_wl32(pb, 0); /* file length */
+        ffio_wfourcc(pb, "RIFF");
+        avio_wl32(pb, 0); /* file length */
     }
 
     ffio_wfourcc(pb, "WAVE");
@@ -199,17 +199,17 @@ static int wav_write_trailer(AVFormatContext *s)
         if (wav->rf64 == RF64_ALWAYS || (wav->rf64 == RF64_AUTO && file_size - 8 > UINT32_MAX)) {
             rf64 = 1;
         } else {
-        avio_seek(pb, 4, SEEK_SET);
-        avio_wl32(pb, (uint32_t)(file_size - 8));
-        avio_seek(pb, file_size, SEEK_SET);
+            avio_seek(pb, 4, SEEK_SET);
+            avio_wl32(pb, (uint32_t)(file_size - 8));
+            avio_seek(pb, file_size, SEEK_SET);
 
-                ff_end_tag(pb, wav->data);
-        avio_flush(pb);
+            ff_end_tag(pb, wav->data);
+            avio_flush(pb);
         }
 
-            number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration,
-                                           s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num,
-                                           s->streams[0]->time_base.den);
+        number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration,
+                                       s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num,
+                                       s->streams[0]->time_base.den);
 
         if(s->streams[0]->codec->codec_tag != 0x01) {
             /* Update num_samps in fact chunk */
@@ -218,9 +218,9 @@ static int wav_write_trailer(AVFormatContext *s)
                 rf64 = 1;
                 avio_wl32(pb, -1);
             } else {
-            avio_wl32(pb, number_of_samples);
-            avio_seek(pb, file_size, SEEK_SET);
-            avio_flush(pb);
+                avio_wl32(pb, number_of_samples);
+                avio_seek(pb, file_size, SEEK_SET);
+                avio_flush(pb);
             }
         }
 
-- 
1.8.1.2