Remove redundant object parameter to stats functions

[vlc] / src / misc / es_format.c

diff --git a/src/misc/es_format.c b/src/misc/es_format.c
index 9864a0fb1a96055f9d855718b9ce886f9bf1354e..51741fecadc20bbe4a3aff70d28b1f250d175fca 100644 (file)
--- a/src/misc/es_format.c
+++ b/src/misc/es_format.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * es_format.c : es_format_t helpers.
  *****************************************************************************
- * Copyright (C) 2008 the VideoLAN team
+ * Copyright (C) 2008 VLC authors and VideoLAN
  * $Id$
  *
  * Author: Laurent Aimar <fenrir@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -206,6 +206,33 @@ void video_format_Setup( video_format_t *p_fmt, vlc_fourcc_t i_chroma,
         break;
     }
 }
+
+void video_format_CopyCrop( video_format_t *p_dst, const video_format_t *p_src )
+{
+    p_dst->i_x_offset       = p_src->i_x_offset;
+    p_dst->i_y_offset       = p_src->i_y_offset;
+    p_dst->i_visible_width  = p_src->i_visible_width;
+    p_dst->i_visible_height = p_src->i_visible_height;
+}
+
+void video_format_ScaleCropAr( video_format_t *p_dst, const video_format_t *p_src )
+{
+    p_dst->i_x_offset       = (uint64_t)p_src->i_x_offset       * p_dst->i_width  / p_src->i_width;
+    p_dst->i_y_offset       = (uint64_t)p_src->i_y_offset       * p_dst->i_height / p_src->i_height;
+    p_dst->i_visible_width  = (uint64_t)p_src->i_visible_width  * p_dst->i_width  / p_src->i_width;
+    p_dst->i_visible_height = (uint64_t)p_src->i_visible_height * p_dst->i_height / p_src->i_height;
+
+    p_dst->i_sar_num *= p_src->i_width;
+    p_dst->i_sar_den *= p_dst->i_width;
+    vlc_ureduce(&p_dst->i_sar_num, &p_dst->i_sar_den,
+                p_dst->i_sar_num, p_dst->i_sar_den, 65536);
+
+    p_dst->i_sar_num *= p_dst->i_height;
+    p_dst->i_sar_den *= p_src->i_height;
+    vlc_ureduce(&p_dst->i_sar_num, &p_dst->i_sar_den,
+                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 )
 {
     video_format_t v1 = *p_fmt1;