virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

cosmetics: K&R coding style and more whitespace for Flash Screen Video

Browse Source
This commit is contained in:
Diego Biurrun
2011-04-24 14:47:54 +02:00
parent 2441003d3f
commit 293fe6da01
2 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/flashsv.c
View File

@@ -49,12 +49,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <zlib.h>
#include "avcodec.h"
#include "get_bits.h"
#include <zlib.h>
typedef struct FlashSVContext {
AVCodecContext *avctx;
AVFrame frame;
@@ -71,8 +70,7 @@ static void copy_region(uint8_t *sptr, uint8_t *dptr,
{
int i;
for (i = dx+h; i > dx; i--)
{
for (i = dx + h; i > dx; i--) {
memcpy(dptr + (i * stride) + dy * 3, sptr, w * 3);
sptr += w * 3;
}
@@ -100,9 +98,8 @@ static av_cold int flashsv_decode_init(AVCodecContext *avctx)
}
static int flashsv_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
AVPacket *avpkt)
static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
int *data_size, AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
@@ -167,16 +164,14 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
}
/* loop over all block columns */
for (j = 0; j < v_blocks + (v_part?1:0); j++)
{
for (j = 0; j < v_blocks + (v_part ? 1 : 0); j++) {
int hp = j * s->block_height; // horiz position in frame
int hs = (j < v_blocks) ? s->block_height : v_part; // size of block
/* loop over all block rows */
for (i = 0; i < h_blocks + (h_part?1:0); i++)
{
for (i = 0; i < h_blocks + (h_part ? 1 : 0); i++) {
int wp = i * s->block_width; // vert position in frame
int ws = (i < h_blocks) ? s->block_width : h_part; // size of block
@@ -193,8 +188,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
} else {
/* decompress block */
int ret = inflateReset(&(s->zstream));
if (ret != Z_OK)
{
if (ret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "error in decompression (reset) of block %dx%d\n", i, j);
/* return -1; */
}
@@ -203,19 +197,18 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
s->zstream.next_out = s->tmpblock;
s->zstream.avail_out = s->block_size*3;
ret = inflate(&(s->zstream), Z_FINISH);
if (ret == Z_DATA_ERROR)
{
if (ret == Z_DATA_ERROR) {
av_log(avctx, AV_LOG_ERROR, "Zlib resync occurred\n");
inflateSync(&(s->zstream));
ret = inflate(&(s->zstream), Z_FINISH);
}
if ((ret != Z_OK) && (ret != Z_STREAM_END))
{
if ((ret != Z_OK) && (ret != Z_STREAM_END)) {
av_log(avctx, AV_LOG_ERROR, "error in decompression of block %dx%d: %d\n", i, j, ret);
/* return -1; */
}
copy_region(s->tmpblock, s->frame.data[0], s->image_height-(hp+hs+1), wp, hs, ws, s->frame.linesize[0]);
copy_region(s->tmpblock, s->frame.data[0], s->image_height - (hp + hs + 1),
wp, hs, ws, s->frame.linesize[0]);
skip_bits_long(&gb, 8 * size); /* skip the consumed bits */
}
}

33
libavcodec/flashsvenc.c
View File

@@ -76,8 +76,9 @@ typedef struct FlashSVContext {
int last_key_frame;
} FlashSVContext;
static int copy_region_enc(uint8_t *sptr, uint8_t *dptr,
int dx, int dy, int h, int w, int stride, uint8_t *pfptr) {
static int copy_region_enc(uint8_t *sptr, uint8_t *dptr, int dx, int dy,
int h, int w, int stride, uint8_t *pfptr)
{
int i, j;
uint8_t *nsptr;
uint8_t *npfptr;
@@ -128,8 +129,10 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx)
}
static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf_size,
int block_width, int block_height, uint8_t *previous_frame, int* I_frame) {
static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf,
int buf_size, int block_width, int block_height,
uint8_t *previous_frame, int *I_frame)
{
PutBitContext pb;
int h_blocks, v_blocks, h_part, v_part, i, j;
@@ -151,15 +154,13 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf
v_part = s->image_height % block_height;
/* loop over all block columns */
for (j = 0; j < v_blocks + (v_part?1:0); j++)
{
for (j = 0; j < v_blocks + (v_part ? 1 : 0); j++) {
int hp = j * block_height; // horiz position in frame
int hs = (j < v_blocks) ? block_height : v_part; // size of block
/* loop over all block rows */
for (i = 0; i < h_blocks + (h_part?1:0); i++)
{
for (i = 0; i < h_blocks + (h_part ? 1 : 0); i++) {
int wp = i * block_width; // vert position in frame
int ws = (i < h_blocks) ? block_width : h_part; // size of block
int ret = Z_OK;
@@ -167,8 +168,11 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf
ptr = buf + buf_pos;
//copy the block to the temp buffer before compression (if it differs from the previous frame's block)
res = copy_region_enc(p->data[0], s->tmpblock, s->image_height-(hp+hs+1), wp, hs, ws, p->linesize[0], previous_frame);
/* copy the block to the temp buffer before compression
* (if it differs from the previous frame's block) */
res = copy_region_enc(p->data[0], s->tmpblock,
s->image_height - (hp + hs + 1),
wp, hs, ws, p->linesize[0], previous_frame);
if (res || *I_frame) {
unsigned long zsize;
@@ -200,7 +204,8 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf
}
static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void *data)
static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf,
int buf_size, void *data)
{
FlashSVContext * const s = avctx->priv_data;
AVFrame *pict = data;
@@ -239,7 +244,8 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_siz
if (buf_size < s->image_width*s->image_height*3) {
//Conservative upper bound check for compressed data
av_log(avctx, AV_LOG_ERROR, "buf_size %d < %d\n", buf_size, s->image_width*s->image_height*3);
av_log(avctx, AV_LOG_ERROR, "buf_size %d < %d\n",
buf_size, s->image_width * s->image_height * 3);
return -1;
}
@@ -249,7 +255,8 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_siz
if (p->linesize[0] > 0)
memcpy(s->previous_frame, p->data[0], s->image_height * p->linesize[0]);
else
memcpy(s->previous_frame, p->data[0] + p->linesize[0] * (s->image_height-1), s->image_height*FFABS(p->linesize[0]));
memcpy(s->previous_frame, p->data[0] + p->linesize[0] * (s->image_height - 1),
s->image_height * FFABS(p->linesize[0]));
//mark the frame type so the muxer can mux it correctly
if (I_frame) {