/*****************************************************************************
* y4m.c: y4m input
*****************************************************************************
- * Copyright (C) 2003-2011 x264 project
+ * Copyright (C) 2003-2015 x264 project
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Loren Merritt <lorenm@u.washington.edu>
int frame_header_len;
uint64_t frame_size;
uint64_t plane_size[3];
+ int bit_depth;
} y4m_hnd_t;
#define Y4M_MAGIC "YUV4MPEG2"
#define Y4M_FRAME_MAGIC "FRAME"
#define MAX_FRAME_HEADER 80
-static int csp_string_to_int( char *csp_name )
+static int parse_csp_and_depth( char *csp_name, int *bit_depth )
{
- int csp = X264_CSP_MAX;
+ int csp = X264_CSP_MAX;
+
+ /* Set colorspace from known variants */
if( !strncmp( "420", csp_name, 3 ) )
csp = X264_CSP_I420;
else if( !strncmp( "422", csp_name, 3 ) )
csp = X264_CSP_I422;
else if( !strncmp( "444", csp_name, 3 ) && strncmp( "444alpha", csp_name, 8 ) ) // only accept alphaless 4:4:4
csp = X264_CSP_I444;
+
+ /* Set high bit depth from known extensions */
+ if( sscanf( csp_name, "%*d%*[pP]%d", bit_depth ) != 1 )
+ *bit_depth = 8;
+
return csp;
}
static int open_file( char *psz_filename, hnd_t *p_handle, video_info_t *info, cli_input_opt_t *opt )
{
- y4m_hnd_t *h = malloc( sizeof(y4m_hnd_t) );
+ y4m_hnd_t *h = calloc( 1, sizeof(y4m_hnd_t) );
int i;
uint32_t n, d;
char header[MAX_YUV4_HEADER+10];
char *tokend, *header_end;
int colorspace = X264_CSP_NONE;
int alt_colorspace = X264_CSP_NONE;
+ int alt_bit_depth = 8;
if( !h )
return -1;
- h->next_frame = 0;
info->vfr = 0;
if( !strcmp( psz_filename, "-" ) )
h->fh = stdin;
else
- h->fh = fopen(psz_filename, "rb");
+ h->fh = x264_fopen(psz_filename, "rb");
if( h->fh == NULL )
return -1;
- h->frame_header_len = strlen( Y4M_FRAME_MAGIC )+1;
-
/* Read header */
for( i = 0; i < MAX_YUV4_HEADER; i++ )
{
break;
}
}
- if( i == MAX_YUV4_HEADER || strncmp( header, Y4M_MAGIC, strlen( Y4M_MAGIC ) ) )
+ if( i == MAX_YUV4_HEADER || strncmp( header, Y4M_MAGIC, sizeof(Y4M_MAGIC)-1 ) )
return -1;
/* Scan properties */
header_end = &header[i+1]; /* Include space */
h->seq_header_len = i+1;
- for( char *tokstart = &header[strlen( Y4M_MAGIC )+1]; tokstart < header_end; tokstart++ )
+ for( char *tokstart = header + sizeof(Y4M_MAGIC); tokstart < header_end; tokstart++ )
{
if( *tokstart == 0x20 )
continue;
tokstart=tokend;
break;
case 'C': /* Color space */
- colorspace = csp_string_to_int( tokstart );
+ colorspace = parse_csp_and_depth( tokstart, &h->bit_depth );
tokstart = strchr( tokstart, 0x20 );
break;
case 'I': /* Interlace type */
{
/* Older nonstandard pixel format representation */
tokstart += 6;
- alt_colorspace = csp_string_to_int( tokstart );
+ alt_colorspace = parse_csp_and_depth( tokstart, &alt_bit_depth );
}
tokstart = strchr( tokstart, 0x20 );
break;
}
if( colorspace == X264_CSP_NONE )
- colorspace = alt_colorspace;
+ {
+ colorspace = alt_colorspace;
+ h->bit_depth = alt_bit_depth;
+ }
- // default to 4:2:0 if nothing is specified
+ // default to 8bit 4:2:0 if nothing is specified
if( colorspace == X264_CSP_NONE )
- colorspace = X264_CSP_I420;
+ {
+ colorspace = X264_CSP_I420;
+ h->bit_depth = 8;
+ }
FAIL_IF_ERROR( colorspace <= X264_CSP_NONE || colorspace >= X264_CSP_MAX, "colorspace unhandled\n" )
+ FAIL_IF_ERROR( h->bit_depth < 8 || h->bit_depth > 16, "unsupported bit depth `%d'\n", h->bit_depth );
info->thread_safe = 1;
info->num_frames = 0;
info->csp = colorspace;
- h->frame_size = h->frame_header_len;
- for( i = 0; i < x264_cli_csps[info->csp].planes; i++ )
+
+ if( h->bit_depth > 8 )
+ info->csp |= X264_CSP_HIGH_DEPTH;
+
+ const x264_cli_csp_t *csp = x264_cli_get_csp( info->csp );
+
+ for( i = 0; i < csp->planes; i++ )
{
h->plane_size[i] = x264_cli_pic_plane_size( info->csp, info->width, info->height, i );
h->frame_size += h->plane_size[i];
+ /* x264_cli_pic_plane_size returns the size in bytes, we need the value in pixels from here on */
+ h->plane_size[i] /= x264_cli_csp_depth_factor( info->csp );
}
- /* Most common case: frame_header = "FRAME" */
if( x264_is_regular_file( h->fh ) )
{
uint64_t init_pos = ftell( h->fh );
+
+ /* Find out the length of the frame header */
+ int len = 1;
+ while( len <= MAX_FRAME_HEADER && fgetc( h->fh ) != '\n' )
+ len++;
+ FAIL_IF_ERROR( len > MAX_FRAME_HEADER || len < sizeof(Y4M_FRAME_MAGIC), "bad frame header length\n" )
+ h->frame_header_len = len;
+ h->frame_size += len;
+
fseek( h->fh, 0, SEEK_END );
uint64_t i_size = ftell( h->fh );
fseek( h->fh, init_pos, SEEK_SET );
return 0;
}
-static int read_frame_internal( cli_pic_t *pic, y4m_hnd_t *h )
+static int read_frame_internal( cli_pic_t *pic, y4m_hnd_t *h, int bit_depth_uc )
{
- size_t slen = strlen( Y4M_FRAME_MAGIC );
+ static const size_t slen = sizeof(Y4M_FRAME_MAGIC)-1;
+ int pixel_depth = x264_cli_csp_depth_factor( pic->img.csp );
int i = 0;
char header[16];
while( i < MAX_FRAME_HEADER && fgetc( h->fh ) != '\n' )
i++;
FAIL_IF_ERROR( i == MAX_FRAME_HEADER, "bad frame header!\n" )
- h->frame_size = h->frame_size - h->frame_header_len + i+slen+1;
- h->frame_header_len = i+slen+1;
int error = 0;
for( i = 0; i < pic->img.planes && !error; i++ )
- error |= fread( pic->img.plane[i], h->plane_size[i], 1, h->fh ) <= 0;
+ {
+ error |= fread( pic->img.plane[i], pixel_depth, h->plane_size[i], h->fh ) != h->plane_size[i];
+ if( bit_depth_uc )
+ {
+ /* upconvert non 16bit high depth planes to 16bit using the same
+ * algorithm as used in the depth filter. */
+ uint16_t *plane = (uint16_t*)pic->img.plane[i];
+ uint64_t pixel_count = h->plane_size[i];
+ int lshift = 16 - h->bit_depth;
+ for( uint64_t j = 0; j < pixel_count; j++ )
+ plane[j] = plane[j] << lshift;
+ }
+ }
return error;
}
else
while( i_frame > h->next_frame )
{
- if( read_frame_internal( pic, h ) )
+ if( read_frame_internal( pic, h, 0 ) )
return -1;
h->next_frame++;
}
}
- if( read_frame_internal( pic, h ) )
+ if( read_frame_internal( pic, h, h->bit_depth & 7 ) )
return -1;
h->next_frame = i_frame+1;
projects / x264 / blobdiff