Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f049729e613e
Choose a base ref
...
head repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01aa664f2153
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 29, 2012

  1. doc/fate: Move fate config example into doc subdirectory

    Be compatible with texi2html 5.0 which doesn't search relative
    file names in search paths anymore.
    
    Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
    beastd committed Sep 29, 2012
    Copy the full SHA
    99b18b1 View commit details
  2. cyuv: implement raw cyuv

    Fixes Ticket1620
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 29, 2012
    Copy the full SHA
    01aa664 View commit details
Showing with 18 additions and 4 deletions.
  1. +2 −2 doc/fate.texi
  2. 0 {tests → doc}/fate_config.sh.template
  3. +16 −2 libavcodec/cyuv.c
4 changes: 2 additions & 2 deletions doc/fate.texi
Original file line number Diff line number Diff line change
@@ -93,11 +93,11 @@ tests/fate.sh /path/to/fate_config
@end example

A configuration file template with comments describing the individual
configuration variables can be found at @file{tests/fate_config.sh.template}.
configuration variables can be found at @file{doc/fate_config.sh.template}.

@ifhtml
The mentioned configuration template is also available here:
@verbatiminclude ../tests/fate_config.sh.template
@verbatiminclude fate_config.sh.template
@end ifhtml

Create a configuration that suits your needs, based on the configuration
File renamed without changes.
18 changes: 16 additions & 2 deletions libavcodec/cyuv.c
Original file line number Diff line number Diff line change
@@ -53,7 +53,6 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx)
if (s->width & 0x3)
return -1;
s->height = avctx->height;
avctx->pix_fmt = PIX_FMT_YUV411P;
avcodec_get_frame_defaults(&s->frame);

return 0;
@@ -83,6 +82,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
int stream_ptr;
unsigned char cur_byte;
int pixel_groups;
int rawsize = s->height * FFALIGN(s->width,2) * 2;

if (avctx->codec_id == AV_CODEC_ID_AURA) {
y_table = u_table;
@@ -92,7 +92,11 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
* followed by (height) lines each with 3 bytes to represent groups
* of 4 pixels. Thus, the total size of the buffer ought to be:
* (3 * 16) + height * (width * 3 / 4) */
if (buf_size != 48 + s->height * (s->width * 3 / 4)) {
if (buf_size == 48 + s->height * (s->width * 3 / 4)) {
avctx->pix_fmt = PIX_FMT_YUV411P;
} else if(buf_size == rawsize ) {
avctx->pix_fmt = PIX_FMT_UYVY422;
} else {
av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n",
buf_size, 48 + s->height * (s->width * 3 / 4));
return -1;
@@ -115,6 +119,15 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
u_plane = s->frame.data[1];
v_plane = s->frame.data[2];

if (buf_size == rawsize) {
int linesize = FFALIGN(s->width,2) * 2;
y_plane += s->frame.linesize[0] * s->height;
for (stream_ptr = 0; stream_ptr < rawsize; stream_ptr += linesize) {
y_plane -= s->frame.linesize[0];
memcpy(y_plane, buf+stream_ptr, linesize);
}
} else {

/* iterate through each line in the height */
for (y_ptr = 0, u_ptr = 0, v_ptr = 0;
y_ptr < (s->height * s->frame.linesize[0]);
@@ -162,6 +175,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,

}
}
}

*data_size=sizeof(AVFrame);
*(AVFrame*)data= s->frame;