void video_format_Setup( video_format_t *p_fmt, vlc_fourcc_t i_chroma,
int i_width, int i_height,
+ int i_visible_width, int i_visible_height,
int i_sar_num, int i_sar_den )
{
p_fmt->i_chroma = vlc_fourcc_GetCodec( VIDEO_ES, i_chroma );
- p_fmt->i_width =
- p_fmt->i_visible_width = i_width;
- p_fmt->i_height =
- p_fmt->i_visible_height = i_height;
+ p_fmt->i_width = i_width;
+ p_fmt->i_visible_width = i_visible_width;
+ p_fmt->i_height = i_height;
+ p_fmt->i_visible_height = i_visible_height;
p_fmt->i_x_offset =
p_fmt->i_y_offset = 0;
vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den,
case VLC_CODEC_RGB32:
case VLC_CODEC_RGBA:
case VLC_CODEC_ARGB:
+ case VLC_CODEC_BGRA:
p_fmt->i_bits_per_pixel = 32;
break;
case VLC_CODEC_RGB24:
p_dst->i_sar_num, p_dst->i_sar_den, 65536);
}
-bool video_format_IsSimilar( const video_format_t *p_fmt1, const video_format_t *p_fmt2 )
+//Simplify transforms to have something more managable. Order: angle, hflip.
+static void transform_GetBasicOps( video_transform_t transform,
+ unsigned *restrict angle,
+ bool *restrict hflip )
{
- video_format_t v1 = *p_fmt1;
- video_format_t v2 = *p_fmt2;
+ *hflip = ORIENT_IS_MIRROR(transform);
- if( v1.i_chroma != v2.i_chroma )
+ switch ( transform )
+ {
+ case TRANSFORM_R90:
+ case TRANSFORM_TRANSPOSE:
+ *angle = 90;
+ break;
+ case TRANSFORM_R180:
+ case TRANSFORM_VFLIP:
+ *angle = 180;
+ break;
+ case TRANSFORM_R270:
+ case TRANSFORM_ANTI_TRANSPOSE:
+ *angle = 270;
+ break;
+ case TRANSFORM_HFLIP:
+ case TRANSFORM_IDENTITY:
+ *angle = 0;
+ break;
+ }
+}
+
+static video_transform_t transform_FromBasicOps( unsigned angle, bool hflip )
+{
+ switch ( angle )
+ {
+ case 90:
+ return hflip ? TRANSFORM_TRANSPOSE : TRANSFORM_R90;
+ case 180:
+ return hflip ? TRANSFORM_VFLIP : TRANSFORM_R180;
+ case 270:
+ return hflip ? TRANSFORM_ANTI_TRANSPOSE : TRANSFORM_R270;
+ default:
+ return hflip ? TRANSFORM_HFLIP : TRANSFORM_IDENTITY;
+ }
+}
+
+video_transform_t video_format_GetTransform( video_orientation_t src,
+ video_orientation_t dst )
+{
+ unsigned angle1, angle2;
+ bool hflip1, hflip2;
+
+ transform_GetBasicOps( (video_transform_t)src, &angle1, &hflip1 );
+ transform_GetBasicOps( transform_Inverse( (video_transform_t)dst ),
+ &angle2, &hflip2 );
+
+ int angle = (angle1 + angle2) % 360;
+ bool hflip = hflip1 ^ hflip2;
+
+ return transform_FromBasicOps(angle, hflip);
+}
+
+void video_format_TransformBy( video_format_t *fmt, video_transform_t transform )
+{
+ /* Get destination orientation */
+ unsigned angle1, angle2;
+ bool hflip1, hflip2;
+
+ transform_GetBasicOps( transform, &angle1, &hflip1 );
+ transform_GetBasicOps( (video_transform_t)fmt->orientation, &angle2, &hflip2 );
+
+ unsigned angle = (angle2 - angle1 + 360) % 360;
+ bool hflip = hflip2 ^ hflip1;
+
+ video_orientation_t dst_orient = ORIENT_NORMAL;
+
+ if( hflip ) {
+
+ if( angle == 0 )
+ dst_orient = ORIENT_HFLIPPED;
+ else if( angle == 90 )
+ dst_orient = ORIENT_ANTI_TRANSPOSED;
+ else if( angle == 180 )
+ dst_orient = ORIENT_VFLIPPED;
+ else if( angle == 270 )
+ dst_orient = ORIENT_TRANSPOSED;
+ }
+ else {
+
+ if( angle == 90 )
+ dst_orient = ORIENT_ROTATED_90;
+ else if( angle == 180 )
+ dst_orient = ORIENT_ROTATED_180;
+ else if( angle == 270 )
+ dst_orient = ORIENT_ROTATED_270;
+ }
+
+ /* Apply transform */
+ if( ORIENT_IS_SWAP( fmt->orientation ) != ORIENT_IS_SWAP( dst_orient ) )
+ {
+ video_format_t scratch = *fmt;
+
+ fmt->i_width = scratch.i_height;
+ fmt->i_visible_width = scratch.i_visible_height;
+ fmt->i_height = scratch.i_width;
+ fmt->i_visible_height = scratch.i_visible_width;
+ fmt->i_x_offset = scratch.i_y_offset;
+ fmt->i_y_offset = scratch.i_x_offset;
+ fmt->i_sar_num = scratch.i_sar_den;
+ fmt->i_sar_den = scratch.i_sar_num;
+ }
+
+ fmt->orientation = dst_orient;
+}
+
+void video_format_TransformTo( video_format_t *restrict fmt,
+ video_orientation_t dst_orientation )
+{
+ video_transform_t transform = video_format_GetTransform(fmt->orientation,
+ dst_orientation);
+ video_format_TransformBy(fmt, transform);
+}
+
+void video_format_ApplyRotation( video_format_t *restrict out,
+ const video_format_t *restrict in )
+{
+ *out = *in;
+
+ video_format_TransformTo(out, ORIENT_NORMAL);
+}
+
+bool video_format_IsSimilar( const video_format_t *f1,
+ const video_format_t *f2 )
+{
+ if( f1->i_chroma != f2->i_chroma )
return false;
- if( v1.i_width != v2.i_width || v1.i_height != v2.i_height ||
- v1.i_visible_width != v2.i_visible_width ||
- v1.i_visible_height != v2.i_visible_height ||
- v1.i_x_offset != v2.i_x_offset || v1.i_y_offset != v2.i_y_offset )
+ if( f1->i_width != f2->i_width || f1->i_height != f2->i_height ||
+ f1->i_visible_width != f2->i_visible_width ||
+ f1->i_visible_height != f2->i_visible_height ||
+ f1->i_x_offset != f2->i_x_offset || f1->i_y_offset != f2->i_y_offset )
return false;
- if( v1.i_sar_num * v2.i_sar_den != v2.i_sar_num * v1.i_sar_den )
+ if( f1->i_sar_num * f2->i_sar_den != f2->i_sar_num * f1->i_sar_den )
return false;
- if( v1.orientation != v2.orientation)
+ if( f1->orientation != f2->orientation)
return false;
- if( v1.i_chroma == VLC_CODEC_RGB15 ||
- v1.i_chroma == VLC_CODEC_RGB16 ||
- v1.i_chroma == VLC_CODEC_RGB24 ||
- v1.i_chroma == VLC_CODEC_RGB32 )
+ if( f1->i_chroma == VLC_CODEC_RGB15 ||
+ f1->i_chroma == VLC_CODEC_RGB16 ||
+ f1->i_chroma == VLC_CODEC_RGB24 ||
+ f1->i_chroma == VLC_CODEC_RGB32 )
{
+ video_format_t v1 = *f1;
+ video_format_t v2 = *f2;
+
video_format_FixRgb( &v1 );
video_format_FixRgb( &v2 );
}
dst->subs.psz_encoding = dst->subs.psz_encoding ? strdup( src->subs.psz_encoding ) : NULL;
+ dst->subs.p_style = src->subs.p_style ? text_style_Duplicate( src->subs.p_style ) : NULL;
if( src->video.p_palette )
{
free( fmt->video.p_palette );
free( fmt->subs.psz_encoding );
+ if ( fmt->subs.p_style ) text_style_Delete( fmt->subs.p_style );
+
if( fmt->i_extra_languages > 0 && fmt->p_extra_languages )
{
int i;
projects / vlc / blobdiff