[FFmpeg-cvslog] flv: K&R formatting cosmetics
Gabriel Dume
git at videolan.org
Tue Sep 2 22:17:00 CEST 2014
ffmpeg | branch: master | Gabriel Dume <gabriel.ddx84 at gmail.com> | Mon Sep 1 15:18:59 2014 -0400| [ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef] | committer: Diego Biurrun
flv: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef
---
libavcodec/flv.h | 8 ++++--
libavcodec/flvdec.c | 19 ++++++-------
libavcodec/flvenc.c | 78 +++++++++++++++++++++++++++------------------------
3 files changed, 56 insertions(+), 49 deletions(-)
diff --git a/libavcodec/flv.h b/libavcodec/flv.h
index 3d9a2d5..801e357 100644
--- a/libavcodec/flv.h
+++ b/libavcodec/flv.h
@@ -1,5 +1,6 @@
/*
* FLV specific private header.
+ *
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
@@ -20,12 +21,13 @@
#ifndef AVCODEC_FLV_H
#define AVCODEC_FLV_H
-#include "mpegvideo.h"
#include "get_bits.h"
+#include "mpegvideo.h"
#include "put_bits.h"
-void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number);
-void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, int last);
+void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number);
+void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run,
+ int last);
int ff_flv_decode_picture_header(MpegEncContext *s);
void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last);
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c
index 3405058..0a6f268 100644
--- a/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@ -1,5 +1,6 @@
/*
* FLV decoding.
+ *
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
@@ -17,21 +18,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "mpegvideo.h"
-#include "h263.h"
-#include "flv.h"
#include "libavutil/imgutils.h"
+#include "flv.h"
+#include "h263.h"
+#include "mpegvideo.h"
+
void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last)
{
int is11 = get_bits1(gb);
*last = get_bits1(gb);
*run = get_bits(gb, 6);
- if (is11) {
+ if (is11)
*level = get_sbits(gb, 11);
- } else {
+ else
*level = get_sbits(gb, 7);
- }
}
int ff_flv_decode_picture_header(MpegEncContext *s)
@@ -128,8 +129,6 @@ AVCodec ff_flv_decoder = {
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
- .pix_fmts = (const enum AVPixelFormat[]) {
- AV_PIX_FMT_YUV420P,
- AV_PIX_FMT_NONE
- },
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE },
};
diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c
index 4d5eb1d..e14a105 100644
--- a/libavcodec/flvenc.c
+++ b/libavcodec/flvenc.c
@@ -1,5 +1,6 @@
/*
* FLV Encoding specific code.
+ *
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
@@ -17,58 +18,62 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "mpegvideo.h"
-#include "h263.h"
#include "flv.h"
+#include "h263.h"
+#include "mpegvideo.h"
-void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number)
+void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number)
{
- int format;
+ int format;
- avpriv_align_put_bits(&s->pb);
+ avpriv_align_put_bits(&s->pb);
- put_bits(&s->pb, 17, 1);
- put_bits(&s->pb, 5, (s->h263_flv-1)); /* 0: h263 escape codes 1: 11-bit escape codes */
- put_bits(&s->pb, 8, (((int64_t)s->picture_number * 30 * s->avctx->time_base.num) / //FIXME use timestamp
- s->avctx->time_base.den) & 0xff); /* TemporalReference */
- if (s->width == 352 && s->height == 288)
+ put_bits(&s->pb, 17, 1);
+ /* 0: h263 escape codes 1: 11-bit escape codes */
+ put_bits(&s->pb, 5, (s->h263_flv - 1));
+ put_bits(&s->pb, 8,
+ (((int64_t) s->picture_number * 30 * s->avctx->time_base.num) / // FIXME use timestamp
+ s->avctx->time_base.den) & 0xff); /* TemporalReference */
+ if (s->width == 352 && s->height == 288)
format = 2;
- else if (s->width == 176 && s->height == 144)
+ else if (s->width == 176 && s->height == 144)
format = 3;
- else if (s->width == 128 && s->height == 96)
+ else if (s->width == 128 && s->height == 96)
format = 4;
- else if (s->width == 320 && s->height == 240)
+ else if (s->width == 320 && s->height == 240)
format = 5;
- else if (s->width == 160 && s->height == 120)
+ else if (s->width == 160 && s->height == 120)
format = 6;
- else if (s->width <= 255 && s->height <= 255)
- format = 0; /* use 1 byte width & height */
- else
- format = 1; /* use 2 bytes width & height */
- put_bits(&s->pb, 3, format); /* PictureSize */
- if (format == 0) {
+ else if (s->width <= 255 && s->height <= 255)
+ format = 0; /* use 1 byte width & height */
+ else
+ format = 1; /* use 2 bytes width & height */
+ put_bits(&s->pb, 3, format); /* PictureSize */
+ if (format == 0) {
put_bits(&s->pb, 8, s->width);
put_bits(&s->pb, 8, s->height);
- } else if (format == 1) {
+ } else if (format == 1) {
put_bits(&s->pb, 16, s->width);
put_bits(&s->pb, 16, s->height);
- }
- put_bits(&s->pb, 2, s->pict_type == AV_PICTURE_TYPE_P); /* PictureType */
- put_bits(&s->pb, 1, 1); /* DeblockingFlag: on */
- put_bits(&s->pb, 5, s->qscale); /* Quantizer */
- put_bits(&s->pb, 1, 0); /* ExtraInformation */
+ }
+ put_bits(&s->pb, 2, s->pict_type == AV_PICTURE_TYPE_P); /* PictureType */
+ put_bits(&s->pb, 1, 1); /* DeblockingFlag: on */
+ put_bits(&s->pb, 5, s->qscale); /* Quantizer */
+ put_bits(&s->pb, 1, 0); /* ExtraInformation */
- if(s->h263_aic){
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_aic_dc_scale_table;
- }else{
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
- }
+ if (s->h263_aic) {
+ s->y_dc_scale_table =
+ s->c_dc_scale_table = ff_aic_dc_scale_table;
+ } else {
+ s->y_dc_scale_table =
+ s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
+ }
}
-void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, int last){
- if(level < 64) { // 7-bit level
+void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level,
+ int run, int last)
+{
+ if (level < 64) { // 7-bit level
put_bits(pb, 1, 0);
put_bits(pb, 1, last);
put_bits(pb, 6, run);
@@ -95,6 +100,7 @@ AVCodec ff_flv_encoder = {
.init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end,
- .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE},
.priv_class = &flv_class,
};
More information about the ffmpeg-cvslog
mailing list