---
libavcodec/flv.h | 2 +-
libavcodec/flvdec.c | 11 ++++-------
libavcodec/flvenc.c | 45 +++++++++++++++++++++++----------------------
3 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/libavcodec/flv.h b/libavcodec/flv.h
index 3d9a2d5..10f78c1 100644
--- a/libavcodec/flv.h
+++ b/libavcodec/flv.h
@@ -24,7 +24,7 @@
#include "get_bits.h"
#include "put_bits.h"
-void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number);
+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);
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c
index 3405058..cd5904b 100644
--- a/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@ -27,11 +27,10 @@ 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 +127,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..13930bf 100644
--- a/libavcodec/flvenc.c
+++ b/libavcodec/flvenc.c
@@ -21,54 +21,55 @@
#include "h263.h"
#include "flv.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;
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
+ 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)
- format = 2;
+ format = 2;
else if (s->width == 176 && s->height == 144)
- format = 3;
+ format = 3;
else if (s->width == 128 && s->height == 96)
- format = 4;
+ format = 4;
else if (s->width == 320 && s->height == 240)
- format = 5;
+ format = 5;
else if (s->width == 160 && s->height == 120)
- format = 6;
+ format = 6;
else if (s->width <= 255 && s->height <= 255)
- format = 0; /* use 1 byte width & height */
+ format = 0; /* use 1 byte width & height */
else
- format = 1; /* use 2 bytes width & height */
+ 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);
+ put_bits(&s->pb, 8, s->width);
+ put_bits(&s->pb, 8, s->height);
} else if (format == 1) {
- put_bits(&s->pb, 16, s->width);
- put_bits(&s->pb, 16, s->height);
+ 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 */
- 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);
--
1.8.5.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
