[FFmpeg-cvslog] mmf: K&R formatting cosmetics
Luca Barbato
git at videolan.org
Fri May 10 09:45:11 CEST 2013
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Thu May 9 10:37:31 2013 +0200| [ee9a4dff4ad76f989c3b5925f76770996506faf4] | committer: Diego Biurrun
mmf: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee9a4dff4ad76f989c3b5925f76770996506faf4
---
libavformat/mmf.c | 84 ++++++++++++++++++++++++++++-------------------------
1 file changed, 45 insertions(+), 39 deletions(-)
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 20570f2..84c4ef7 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -21,8 +21,8 @@
#include "libavutil/channel_layout.h"
#include "avformat.h"
-#include "internal.h"
#include "avio_internal.h"
+#include "internal.h"
#include "pcm.h"
#include "riff.h"
@@ -35,7 +35,7 @@ static const int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 };
static int mmf_rate(int code)
{
- if((code < 0) || (code > 4))
+ if ((code < 0) || (code > 4))
return -1;
return mmf_rates[code];
}
@@ -44,8 +44,8 @@ static int mmf_rate(int code)
static int mmf_rate_code(int rate)
{
int i;
- for(i = 0; i < 5; i++)
- if(mmf_rates[i] == rate)
+ for (i = 0; i < 5; i++)
+ if (mmf_rates[i] == rate)
return i;
return -1;
}
@@ -69,8 +69,9 @@ static int mmf_write_header(AVFormatContext *s)
int rate;
rate = mmf_rate_code(s->streams[0]->codec->sample_rate);
- if(rate < 0) {
- av_log(s, AV_LOG_ERROR, "Unsupported sample rate %d\n", s->streams[0]->codec->sample_rate);
+ if (rate < 0) {
+ av_log(s, AV_LOG_ERROR, "Unsupported sample rate %d\n",
+ s->streams[0]->codec->sample_rate);
return -1;
}
@@ -82,7 +83,7 @@ static int mmf_write_header(AVFormatContext *s)
avio_w8(pb, 0); /* code type */
avio_w8(pb, 0); /* status */
avio_w8(pb, 0); /* counts */
- avio_write(pb, "VN:libavcodec,", sizeof("VN:libavcodec,") -1); /* metadata ("ST:songtitle,VN:version,...") */
+ avio_write(pb, "VN:libavcodec,", sizeof("VN:libavcodec,") - 1); /* metadata ("ST:songtitle,VN:version,...") */
end_tag_be(pb, pos);
avio_write(pb, "ATR\x00", 4);
@@ -120,7 +121,7 @@ static int mmf_write_packet(AVFormatContext *s, AVPacket *pkt)
/* Write a variable-length symbol */
static void put_varlength(AVIOContext *pb, int val)
{
- if(val < 128)
+ if (val < 128)
avio_w8(pb, val);
else {
val -= 128;
@@ -142,7 +143,7 @@ static int mmf_write_trailer(AVFormatContext *s)
end_tag_be(pb, mmf->atrpos);
end_tag_be(pb, 8);
- pos = avio_tell(pb);
+ pos = avio_tell(pb);
size = pos - mmf->awapos;
/* Fill Atsq chunk */
@@ -197,11 +198,13 @@ static int mmf_read_header(AVFormatContext *s)
avio_skip(pb, 4); /* file_size */
/* Skip some unused chunks that may or may not be present */
- for(;; avio_skip(pb, size)) {
- tag = avio_rl32(pb);
+ for (;; avio_skip(pb, size)) {
+ tag = avio_rl32(pb);
size = avio_rb32(pb);
- if(tag == MKTAG('C','N','T','I')) continue;
- if(tag == MKTAG('O','P','D','A')) continue;
+ if (tag == MKTAG('C', 'N', 'T', 'I'))
+ continue;
+ if (tag == MKTAG('O', 'P', 'D', 'A'))
+ continue;
break;
}
@@ -218,8 +221,8 @@ static int mmf_read_header(AVFormatContext *s)
avio_r8(pb); /* format type */
avio_r8(pb); /* sequence type */
params = avio_r8(pb); /* (channel << 7) | (format << 4) | rate */
- rate = mmf_rate(params & 0x0f);
- if(rate < 0) {
+ rate = mmf_rate(params & 0x0f);
+ if (rate < 0) {
av_log(s, AV_LOG_ERROR, "Invalid sample rate\n");
return -1;
}
@@ -228,11 +231,13 @@ static int mmf_read_header(AVFormatContext *s)
avio_r8(pb); /* time base g */
/* Skip some unused chunks that may or may not be present */
- for(;; avio_skip(pb, size)) {
- tag = avio_rl32(pb);
+ for (;; avio_skip(pb, size)) {
+ tag = avio_rl32(pb);
size = avio_rb32(pb);
- if(tag == MKTAG('A','t','s','q')) continue;
- if(tag == MKTAG('A','s','p','I')) continue;
+ if (tag == MKTAG('A', 't', 's', 'q'))
+ continue;
+ if (tag == MKTAG('A', 's', 'p', 'I'))
+ continue;
break;
}
@@ -247,13 +252,14 @@ static int mmf_read_header(AVFormatContext *s)
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
- st->codec->sample_rate = rate;
- st->codec->channels = 1;
- st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
+ st->codec->sample_rate = rate;
+ st->codec->channels = 1;
+ st->codec->channel_layout = AV_CH_LAYOUT_MONO;
st->codec->bits_per_coded_sample = 4;
- st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample;
+ st->codec->bit_rate = st->codec->sample_rate *
+ st->codec->bits_per_coded_sample;
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
@@ -262,8 +268,7 @@ static int mmf_read_header(AVFormatContext *s)
#define MAX_SIZE 4096
-static int mmf_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+static int mmf_read_packet(AVFormatContext *s, AVPacket *pkt)
{
MMFContext *mmf = s->priv_data;
int ret, size;
@@ -272,10 +277,10 @@ static int mmf_read_packet(AVFormatContext *s,
return AVERROR(EIO);
size = MAX_SIZE;
- if(size > mmf->data_size)
+ if (size > mmf->data_size)
size = mmf->data_size;
- if(!size)
+ if (!size)
return AVERROR(EIO);
if (av_new_packet(pkt, size))
@@ -303,17 +308,18 @@ AVInputFormat ff_mmf_demuxer = {
.read_seek = ff_pcm_read_seek,
};
#endif
+
#if CONFIG_MMF_MUXER
AVOutputFormat ff_mmf_muxer = {
- .name = "mmf",
- .long_name = NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
- .mime_type = "application/vnd.smaf",
- .extensions = "mmf",
- .priv_data_size = sizeof(MMFContext),
- .audio_codec = AV_CODEC_ID_ADPCM_YAMAHA,
- .video_codec = AV_CODEC_ID_NONE,
- .write_header = mmf_write_header,
- .write_packet = mmf_write_packet,
- .write_trailer = mmf_write_trailer,
+ .name = "mmf",
+ .long_name = NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
+ .mime_type = "application/vnd.smaf",
+ .extensions = "mmf",
+ .priv_data_size = sizeof(MMFContext),
+ .audio_codec = AV_CODEC_ID_ADPCM_YAMAHA,
+ .video_codec = AV_CODEC_ID_NONE,
+ .write_header = mmf_write_header,
+ .write_packet = mmf_write_packet,
+ .write_trailer = mmf_write_trailer,
};
#endif
More information about the ffmpeg-cvslog
mailing list