mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
nuv: K&R formatting cosmetics
This commit is contained in:
parent
baac24e680
commit
cf22705e87
@ -18,6 +18,7 @@
|
||||
* License along with Libav; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -34,7 +35,7 @@ typedef struct {
|
||||
int quality;
|
||||
int width, height;
|
||||
unsigned int decomp_size;
|
||||
unsigned char* decomp_buf;
|
||||
unsigned char *decomp_buf;
|
||||
uint32_t lq[64], cq[64];
|
||||
RTJpegContext rtj;
|
||||
DSPContext dsp;
|
||||
@ -69,8 +70,8 @@ static const uint8_t fallback_cquant[] = {
|
||||
* @param width width of the video frame
|
||||
* @param height height of the video frame
|
||||
*/
|
||||
static void copy_frame(AVFrame *f, const uint8_t *src,
|
||||
int width, int height) {
|
||||
static void copy_frame(AVFrame *f, const uint8_t *src, int width, int height)
|
||||
{
|
||||
AVPicture pic;
|
||||
avpicture_fill(&pic, src, PIX_FMT_YUV420P, width, height);
|
||||
av_picture_copy((AVPicture *)f, &pic, PIX_FMT_YUV420P, width, height);
|
||||
@ -79,8 +80,9 @@ static void copy_frame(AVFrame *f, const uint8_t *src,
|
||||
/**
|
||||
* @brief extract quantization tables from codec data into our context
|
||||
*/
|
||||
static int get_quant(AVCodecContext *avctx, NuvContext *c,
|
||||
const uint8_t *buf, int size) {
|
||||
static int get_quant(AVCodecContext *avctx, NuvContext *c, const uint8_t *buf,
|
||||
int size)
|
||||
{
|
||||
int i;
|
||||
if (size < 2 * 64 * 4) {
|
||||
av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n");
|
||||
@ -96,7 +98,8 @@ static int get_quant(AVCodecContext *avctx, NuvContext *c,
|
||||
/**
|
||||
* @brief set quantization tables from a quality value
|
||||
*/
|
||||
static void get_quant_quality(NuvContext *c, int quality) {
|
||||
static void get_quant_quality(NuvContext *c, int quality)
|
||||
{
|
||||
int i;
|
||||
quality = FFMAX(quality, 1);
|
||||
for (i = 0; i < 64; i++) {
|
||||
@ -105,7 +108,9 @@ static void get_quant_quality(NuvContext *c, int quality) {
|
||||
}
|
||||
}
|
||||
|
||||
static int codec_reinit(AVCodecContext *avctx, int width, int height, int quality) {
|
||||
static int codec_reinit(AVCodecContext *avctx, int width, int height,
|
||||
int quality)
|
||||
{
|
||||
NuvContext *c = avctx->priv_data;
|
||||
width = FFALIGN(width, 2);
|
||||
height = FFALIGN(height, 2);
|
||||
@ -116,19 +121,25 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, int qualit
|
||||
return 0;
|
||||
avctx->width = c->width = width;
|
||||
avctx->height = c->height = height;
|
||||
av_fast_malloc(&c->decomp_buf, &c->decomp_size, c->height * c->width * 3 / 2);
|
||||
av_fast_malloc(&c->decomp_buf, &c->decomp_size,
|
||||
c->height * c->width * 3 / 2);
|
||||
if (!c->decomp_buf) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"Can't allocate decompression buffer.\n");
|
||||
return 0;
|
||||
}
|
||||
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
|
||||
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
|
||||
c->lq, c->cq);
|
||||
} else if (quality != c->quality)
|
||||
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
|
||||
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
|
||||
c->lq, c->cq);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
|
||||
AVPacket *avpkt) {
|
||||
AVPacket *avpkt)
|
||||
{
|
||||
const uint8_t *buf = avpkt->data;
|
||||
int buf_size = avpkt->size;
|
||||
NuvContext *c = avctx->priv_data;
|
||||
@ -136,9 +147,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
|
||||
int orig_size = buf_size;
|
||||
int keyframe;
|
||||
int result;
|
||||
enum {NUV_UNCOMPRESSED = '0', NUV_RTJPEG = '1',
|
||||
NUV_RTJPEG_IN_LZO = '2', NUV_LZO = '3',
|
||||
NUV_BLACK = 'N', NUV_COPY_LAST = 'L'} comptype;
|
||||
enum {
|
||||
NUV_UNCOMPRESSED = '0',
|
||||
NUV_RTJPEG = '1',
|
||||
NUV_RTJPEG_IN_LZO = '2',
|
||||
NUV_LZO = '3',
|
||||
NUV_BLACK = 'N',
|
||||
NUV_COPY_LAST = 'L'
|
||||
} comptype;
|
||||
|
||||
if (buf_size < 12) {
|
||||
av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
|
||||
@ -154,7 +170,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
|
||||
ret = get_quant(avctx, c, buf, buf_size);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
|
||||
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq,
|
||||
c->cq);
|
||||
return orig_size;
|
||||
}
|
||||
|
||||
@ -166,11 +183,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
|
||||
switch (comptype) {
|
||||
case NUV_RTJPEG_IN_LZO:
|
||||
case NUV_RTJPEG:
|
||||
keyframe = !buf[2]; break;
|
||||
keyframe = !buf[2];
|
||||
break;
|
||||
case NUV_COPY_LAST:
|
||||
keyframe = 0; break;
|
||||
keyframe = 0;
|
||||
break;
|
||||
default:
|
||||
keyframe = 1; break;
|
||||
keyframe = 1;
|
||||
break;
|
||||
}
|
||||
// skip rest of the frameheader.
|
||||
buf = &buf[12];
|
||||
@ -224,20 +244,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
|
||||
break;
|
||||
}
|
||||
case NUV_RTJPEG_IN_LZO:
|
||||
case NUV_RTJPEG: {
|
||||
case NUV_RTJPEG:
|
||||
ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
|
||||
break;
|
||||
}
|
||||
case NUV_BLACK: {
|
||||
case NUV_BLACK:
|
||||
memset(c->pic.data[0], 0, c->width * c->height);
|
||||
memset(c->pic.data[1], 128, c->width * c->height / 4);
|
||||
memset(c->pic.data[2], 128, c->width * c->height / 4);
|
||||
break;
|
||||
}
|
||||
case NUV_COPY_LAST: {
|
||||
case NUV_COPY_LAST:
|
||||
/* nothing more to do here */
|
||||
break;
|
||||
}
|
||||
default:
|
||||
av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
|
||||
return -1;
|
||||
@ -248,7 +265,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
|
||||
return orig_size;
|
||||
}
|
||||
|
||||
static av_cold int decode_init(AVCodecContext *avctx) {
|
||||
static av_cold int decode_init(AVCodecContext *avctx)
|
||||
{
|
||||
NuvContext *c = avctx->priv_data;
|
||||
avctx->pix_fmt = PIX_FMT_YUV420P;
|
||||
c->pic.data[0] = NULL;
|
||||
@ -256,20 +274,28 @@ static av_cold int decode_init(AVCodecContext *avctx) {
|
||||
c->quality = -1;
|
||||
c->width = 0;
|
||||
c->height = 0;
|
||||
|
||||
c->codec_frameheader = avctx->codec_tag == MKTAG('R', 'J', 'P', 'G');
|
||||
|
||||
if (avctx->extradata_size)
|
||||
get_quant(avctx, c, avctx->extradata, avctx->extradata_size);
|
||||
|
||||
ff_dsputil_init(&c->dsp, avctx);
|
||||
|
||||
if (!codec_reinit(avctx, avctx->width, avctx->height, -1))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static av_cold int decode_end(AVCodecContext *avctx) {
|
||||
static av_cold int decode_end(AVCodecContext *avctx)
|
||||
{
|
||||
NuvContext *c = avctx->priv_data;
|
||||
|
||||
av_freep(&c->decomp_buf);
|
||||
if (c->pic.data[0])
|
||||
avctx->release_buffer(avctx, &c->pic);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user