Commit ff4d1aa8 authored by Gabriel Dume's avatar Gabriel Dume Committed by Diego Biurrun

flv: K&R formatting cosmetics

Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent f61e47dd
/*
* 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);
......
/*
* 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 },
};
/*
* FLV Encoding specific code.
*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
......@@ -17,19 +18,21 @@
* 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;
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
/* 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;
......@@ -58,17 +61,19 @@ void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number)
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,
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment