[patch] r_frame_rate -> avg_frame_rate

libdlna-0.2.4-libav10-frame_rate.patch (text/plain), 5.16 KB, created by Jyrki Launonen on 2015-05-25 08:43:21 UTC

diff -ur a/src/av_mpeg1.c b/src/av_mpeg1.c
--- a/src/av_mpeg1.c	2012-02-26 21:34:00.000000000 +0200
+++ b/src/av_mpeg1.c	2015-05-25 11:16:39.236149238 +0300
@@ -56,16 +56,16 @@
   */
   if (codecs->vc->width == 352 && codecs->vc->height == 288)
   {
-    if (codecs->vs->r_frame_rate.num != 25 &&
-        codecs->vs->r_frame_rate.den != 1)
+    if (codecs->vs->avg_frame_rate.num != 25 &&
+        codecs->vs->avg_frame_rate.den != 1)
           return NULL;
   }
   else if (codecs->vc->width == 352 && codecs->vc->height == 240)
   {
-    if ((codecs->vs->r_frame_rate.num != 30000 &&
-         codecs->vs->r_frame_rate.den != 1001) ||
-        (codecs->vs->r_frame_rate.num != 24000 &&
-         codecs->vs->r_frame_rate.den != 1001))
+    if ((codecs->vs->avg_frame_rate.num != 30000 &&
+         codecs->vs->avg_frame_rate.den != 1001) ||
+        (codecs->vs->avg_frame_rate.num != 24000 &&
+         codecs->vs->avg_frame_rate.den != 1001))
           return NULL;
   }
   else
diff -ur a/src/av_mpeg2.c b/src/av_mpeg2.c
--- a/src/av_mpeg2.c	2012-02-26 21:34:00.000000000 +0200
+++ b/src/av_mpeg2.c	2015-05-25 11:16:39.237149238 +0300
@@ -379,8 +379,8 @@
   int i;
 
   /* determine region through frame rate */
-  if ((codecs->vs->r_frame_rate.num == 30000 &&
-       codecs->vs->r_frame_rate.den == 1001)) /* NTSC */
+  if ((codecs->vs->avg_frame_rate.num == 30000 &&
+       codecs->vs->avg_frame_rate.den == 1001)) /* NTSC */
   {
     for (i = 0; i < (int) (sizeof (mpeg_ps_es_valid_streams_ntsc)
                            / sizeof (mpeg_ps_es_stream_t)); i++)
@@ -402,8 +402,8 @@
     /* invalid resolution */
     return NULL;
   }
-  else if (codecs->vs->r_frame_rate.num == 25 &&
-           codecs->vs->r_frame_rate.den == 1) /* PAL */
+  else if (codecs->vs->avg_frame_rate.num == 25 &&
+           codecs->vs->avg_frame_rate.den == 1) /* PAL */
   {
     for (i = 0; i < (int) (sizeof (mpeg_ps_es_valid_streams_pal)
                            / sizeof (mpeg_ps_es_stream_t)); i++)
@@ -460,8 +460,8 @@
       return NULL;
 
     /* 30 fps */
-    if (codecs->vs->r_frame_rate.num != 30 &&
-        codecs->vs->r_frame_rate.den != 1)
+    if (codecs->vs->avg_frame_rate.num != 30 &&
+        codecs->vs->avg_frame_rate.den != 1)
       return NULL;
 
     /* video bitrate is less or equal to 4 Mbps */
@@ -486,8 +486,8 @@
   }
 
   /* check for Region: only Europe supports 25 fps (50i) */
-  if (codecs->vs->r_frame_rate.num == 25 &&
-      codecs->vs->r_frame_rate.den == 1)
+  if (codecs->vs->avg_frame_rate.num == 25 &&
+      codecs->vs->avg_frame_rate.den == 1)
   {
     for (i = 0; i < (int) (sizeof (mpeg_ts_valid_streams_eu_sd)
                            / sizeof (mpeg_ts_stream_t)); i++)
@@ -559,9 +559,9 @@
     if (mpeg_ts_valid_streams_na_sd[i].width == codecs->vc->width &&
         mpeg_ts_valid_streams_na_sd[i].height == codecs->vc->height &&
         mpeg_ts_valid_streams_na_sd[i].fps_num
-        == codecs->vs->r_frame_rate.num &&
+        == codecs->vs->avg_frame_rate.num &&
         mpeg_ts_valid_streams_na_sd[i].fps_den
-        == codecs->vs->r_frame_rate.num)
+        == codecs->vs->avg_frame_rate.num)
     {
       switch (st)
       {
@@ -584,9 +584,9 @@
     if (mpeg_ts_valid_streams_na_hd[i].width == codecs->vc->width &&
         mpeg_ts_valid_streams_na_hd[i].height == codecs->vc->height &&
         mpeg_ts_valid_streams_na_hd[i].fps_num
-        == codecs->vs->r_frame_rate.num &&
+        == codecs->vs->avg_frame_rate.num &&
         mpeg_ts_valid_streams_na_hd[i].fps_den
-        == codecs->vs->r_frame_rate.num)
+        == codecs->vs->avg_frame_rate.num)
     {
       switch (st)
       {
diff -ur a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c
--- a/src/av_mpeg4_part10.c	2012-02-26 21:34:00.000000000 +0200
+++ b/src/av_mpeg4_part10.c	2015-05-25 11:16:39.239149238 +0300
@@ -1151,7 +1151,7 @@
     /* QCIF */
     if (vc->bit_rate <= 128000 && ctx->bit_rate <= 256000)
     {
-      if (vs->r_frame_rate.num == 15 && vs->r_frame_rate.num == 1)
+      if (vs->avg_frame_rate.num == 15 && vs->avg_frame_rate.num == 1)
         return AVC_VIDEO_PROFILE_BL_QCIF15;
       else
         return AVC_VIDEO_PROFILE_BL_L1B_QCIF;
diff -ur a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c
--- a/src/av_mpeg4_part2.c	2012-02-26 21:34:00.000000000 +0200
+++ b/src/av_mpeg4_part2.c	2015-05-25 11:16:39.242149238 +0300
@@ -780,7 +780,7 @@
   {
     if (res[i].width == vc->width &&
         res[i].height == vc->height &&
-        (vs->r_frame_rate.num / vs->r_frame_rate.num)
+        (vs->avg_frame_rate.num / vs->avg_frame_rate.num)
         <= (res[i].fps_num / res[i].fps_den))
       return 1;
   }
diff -ur a/src/av_wmv9.c b/src/av_wmv9.c
--- a/src/av_wmv9.c	2012-02-26 21:34:00.000000000 +0200
+++ b/src/av_wmv9.c	2015-05-25 11:16:39.244149238 +0300
@@ -193,8 +193,8 @@
   for (i = 0; i < size / (int) sizeof (wmv9_profile_t); i++)
     if (vc->width <= profile[i].max_width &&
         vc->height <= profile[i].max_height &&
-        vs->r_frame_rate.num == profile[i].fps_num &&
-        vs->r_frame_rate.den == profile[i].fps_den &&
+        vs->avg_frame_rate.num == profile[i].fps_num &&
+        vs->avg_frame_rate.den == profile[i].fps_den &&
         vc->bit_rate <= profile[i].max_bitrate)
       return 1;