diff options
| author | Thiago Santos <thiago.sousa.santos@collabora.com> | 2013-03-22 09:27:39 -0300 |
|---|---|---|
| committer | Thiago Santos <thiago.sousa.santos@collabora.com> | 2013-04-16 16:08:51 -0300 |
| commit | 8b41f5e326bac8276796f28d8857ffdb6388b09e (patch) | |
| tree | 02ed008de6dfcce5587a2e41d1bac0f4e4394c44 | |
| parent | d44c7f9baf6af8a1546198caf46bd18a25b4bf9e (diff) | |
| download | gstreamer-plugins-bad-8b41f5e326bac8276796f28d8857ffdb6388b09e.tar.gz | |
eglglessink: rename pixel_aspect_ratio to pixel_aspect_ratio_n
We have the pixel_aspect_ratio_d variable, so better make it clear
that the other one is the _n
| -rw-r--r-- | ext/eglgles/gstegladaptation.h | 2 | ||||
| -rw-r--r-- | ext/eglgles/gstegladaptation_eagl.m | 2 | ||||
| -rw-r--r-- | ext/eglgles/gstegladaptation_egl.c | 8 | ||||
| -rw-r--r-- | ext/eglgles/gsteglglessink.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ext/eglgles/gstegladaptation.h b/ext/eglgles/gstegladaptation.h index f648e29d1..6e11fb855 100644 --- a/ext/eglgles/gstegladaptation.h +++ b/ext/eglgles/gstegladaptation.h @@ -112,7 +112,7 @@ struct GstEglAdaptationContext gint surface_width; gint surface_height; - gint pixel_aspect_ratio; + gint pixel_aspect_ratio_n; gint pixel_aspect_ratio_d; GLuint fragshader[3]; /* frame, border, frame-platform */ diff --git a/ext/eglgles/gstegladaptation_eagl.m b/ext/eglgles/gstegladaptation_eagl.m index a7a0dd5a3..2e8ecd435 100644 --- a/ext/eglgles/gstegladaptation_eagl.m +++ b/ext/eglgles/gstegladaptation_eagl.m @@ -229,7 +229,7 @@ void gst_egl_adaptation_query_par (GstEglAdaptationContext * ctx) { /* TODO how can we check this? */ - ctx->pixel_aspect_ratio = 1; + ctx->pixel_aspect_ratio_n = 1; ctx->pixel_aspect_ratio_d = 1; } diff --git a/ext/eglgles/gstegladaptation_egl.c b/ext/eglgles/gstegladaptation_egl.c index fdefebd8e..b9052df4b 100644 --- a/ext/eglgles/gstegladaptation_egl.c +++ b/ext/eglgles/gstegladaptation_egl.c @@ -331,7 +331,7 @@ gst_egl_adaptation_query_par (GstEglAdaptationContext * ctx) if (ctx->eglglesctx->egl_major == 1 && ctx->eglglesctx->egl_minor < 2) { GST_DEBUG_OBJECT (ctx->element, "Can't query PAR. Using default: %dx%d", EGL_DISPLAY_SCALING, EGL_DISPLAY_SCALING); - ctx->pixel_aspect_ratio = EGL_DISPLAY_SCALING; + ctx->pixel_aspect_ratio_n = EGL_DISPLAY_SCALING; } else { eglQuerySurface (ctx->eglglesctx->display, ctx->eglglesctx->surface, EGL_PIXEL_ASPECT_RATIO, &display_par); @@ -343,11 +343,11 @@ gst_egl_adaptation_query_par (GstEglAdaptationContext * ctx) display_par > EGL_SANE_DAR_MAX) { GST_DEBUG_OBJECT (ctx->element, "Nonsensical PAR value returned: %d. " "Bad EGL implementation? " - "Will use default: %d/%d", ctx->pixel_aspect_ratio, + "Will use default: %d/%d", ctx->pixel_aspect_ratio_n, EGL_DISPLAY_SCALING, EGL_DISPLAY_SCALING); - ctx->pixel_aspect_ratio = EGL_DISPLAY_SCALING; + ctx->pixel_aspect_ratio_n = EGL_DISPLAY_SCALING; } else { - ctx->pixel_aspect_ratio = display_par; + ctx->pixel_aspect_ratio_n = display_par; } } } diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c index 130bf83fc..7c1b48a4c 100644 --- a/ext/eglgles/gsteglglessink.c +++ b/ext/eglgles/gsteglglessink.c @@ -896,7 +896,7 @@ gst_eglglessink_render (GstEglGlesSink * eglglessink) w, h, eglglessink->par_n, eglglessink->par_d, - eglglessink->egl_context->pixel_aspect_ratio, + eglglessink->egl_context->pixel_aspect_ratio_n, eglglessink->egl_context->pixel_aspect_ratio_d)) { GST_WARNING_OBJECT (eglglessink, "Could not compute resulting DAR"); frame.w = w; |