generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ivi_common: make ff_ivi_process_empty_tile() static.

Browse Source 
It's not used outside of ivi_common.c
(cherry picked from commit 5d2170c53b)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Anton Khirnov
2012-09-29 11:06:54 +02:00
committed by Reinhard Tartler
parent c5ec190859
commit 332555f660
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/ivi_common.c
View File

@@ -491,7 +491,16 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile)
return 0; return 0;
} }
void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, /**
* Handle empty tiles by performing data copying and motion
* compensation respectively.
*
* @param[in] avctx ptr to the AVCodecContext
* @param[in] band pointer to the band descriptor
* @param[in] tile pointer to the tile descriptor
* @param[in] mv_scale scaling factor for motion vectors
*/
static void ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
IVITile *tile, int32_t mv_scale) IVITile *tile, int32_t mv_scale)
{ {
int x, y, need_mc, mbn, blk, num_blocks, mv_x, mv_y, mc_type; int x, y, need_mc, mbn, blk, num_blocks, mv_x, mv_y, mc_type;
@@ -696,7 +705,7 @@ static int decode_band(IVI45DecContext *ctx, int plane_num,
} }
tile->is_empty = get_bits1(&ctx->gb); tile->is_empty = get_bits1(&ctx->gb);
if (tile->is_empty) { if (tile->is_empty) {
ff_ivi_process_empty_tile(avctx, band, tile, ivi_process_empty_tile(avctx, band, tile,
(ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3)); (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3));
av_dlog(avctx, "Empty tile encountered!\n"); av_dlog(avctx, "Empty tile encountered!\n");
} else { } else {

12
libavcodec/ivi_common.h
View File

@@ -373,18 +373,6 @@ int ff_ivi_dec_tile_data_size(GetBitContext *gb);
*/ */
int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile); int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile);
/**
* Handle empty tiles by performing data copying and motion
* compensation respectively.
*
* @param[in] avctx ptr to the AVCodecContext
* @param[in] band pointer to the band descriptor
* @param[in] tile pointer to the tile descriptor
* @param[in] mv_scale scaling factor for motion vectors
*/
void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
IVITile *tile, int32_t mv_scale);
/** /**
* Convert and output the current plane. * Convert and output the current plane.
* This conversion is done by adding back the bias value of 128 * This conversion is done by adding back the bias value of 128