[FFmpeg-soc] [patch 05/12] Multithreading commits

[Alexander Strange]

Cosmetics: rename ff_mt_*_buffer.

From 689ac7d471b76355090cf6945b94feff7502f901 Mon Sep 17 00:00:00 2001
From: Alexander Strange <[EMAIL PROTECTED]>
Date: Thu, 5 Jun 2008 20:36:38 -0400
Subject: [PATCH] Cosmetics: rename ff_mt_*_buffer.

---
 libavcodec/framethread.c |    8 ++++----
 libavcodec/mimic.c       |    8 ++++----
 libavcodec/thread.h      |   12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libavcodec/framethread.c b/libavcodec/framethread.c
index 8c5740d..31eb7a9 100644
--- a/libavcodec/framethread.c
+++ b/libavcodec/framethread.c
@@ -122,7 +122,7 @@ static void submit_frame(PerThreadContext * volatile p, const uint8_t *buf, int
     p->predecoded = 0;
 
     for (i = 0; i < p->nb_released_buffers; i++)
-        ff_mt_release_buffer(&p->released_buffers[i]);
+        ff_release_buffer(&p->released_buffers[i]);
 
     p->nb_released_buffers = 0;
 
@@ -307,7 +307,7 @@ void ff_frame_thread_free(AVCodecContext *avctx) {
     av_free(fctx);
 }
 
-int ff_mt_get_buffer(AVCodecContext *avctx, AVFrame *f)
+int ff_get_buffer(AVCodecContext *avctx, AVFrame *f)
 {
     int ret, *progress;
     PerThreadContext *p = avctx->thread_opaque;
@@ -328,7 +328,7 @@ int ff_mt_get_buffer(AVCodecContext *avctx, AVFrame *f)
     return ret;
 }
 
-void ff_mt_release_buffer(AVFrame *f)
+void ff_release_buffer(AVFrame *f)
 {
     PerThreadContext *p = f->avctx->thread_opaque;
 
@@ -344,7 +344,7 @@ void ff_mt_release_buffer(AVFrame *f)
     pthread_mutex_unlock(&p->buffer_mutex);
 }
 
-void ff_mt_delayed_release_buffer(AVCodecContext *avctx, AVFrame *f)
+void ff_delayed_release_buffer(AVCodecContext *avctx, AVFrame *f)
 {
     PerThreadContext *p = avctx->thread_opaque;
 
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 6a9e536..4efb721 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -347,7 +347,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data,
     }
 
     ctx->buf_ptrs[ctx->cur_index].reference = 1;
-    if(ff_mt_get_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index])) {
+    if(ff_get_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index])) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
@@ -372,7 +372,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data,
     init_get_bits(&ctx->gb, ctx->swap_buf, swap_buf_size << 3);
 
     if(!decode(ctx, quality, num_coeffs, !is_pframe)) {
-        ff_mt_release_buffer(&ctx->buf_ptrs[ctx->cur_index]);
+        ff_release_buffer(&ctx->buf_ptrs[ctx->cur_index]);
         return -1;
     }
 
@@ -385,7 +385,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data,
 
     /* Only release frames that aren't used for backreferences anymore */
     if(ctx->buf_ptrs[ctx->cur_index].data[0])
-        ff_mt_release_buffer(&ctx->buf_ptrs[ctx->cur_index]);
+        ff_release_buffer(&ctx->buf_ptrs[ctx->cur_index]);
 
     return buf_size;
 }
@@ -398,7 +398,7 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx)
     av_free(ctx->swap_buf);
     for(i = 0; i < 16; i++)
         if(ctx->buf_ptrs[i].data[0] && avctx == ctx->buf_ptrs[i].avctx)
-            ff_mt_release_buffer(&ctx->buf_ptrs[i]);
+            ff_release_buffer(&ctx->buf_ptrs[i]);
     if (!avctx->is_copy) free_vlc(&ctx->vlc);
 
     return 0;
diff --git a/libavcodec/thread.h b/libavcodec/thread.h
index fc0b770..ce5c5fe 100644
--- a/libavcodec/thread.h
+++ b/libavcodec/thread.h
@@ -38,9 +38,9 @@ void ff_report_predecode_done(AVCodecContext *avctx);
 void ff_report_decode_progress(AVFrame *f, int progress);
 void ff_await_decode_progress(AVFrame *f, int progress);
 
-int ff_mt_get_buffer(AVCodecContext *avctx, AVFrame *f);
-void ff_mt_release_buffer(AVFrame *f);
-void ff_mt_delayed_release_buffer(AVCodecContext *avctx, AVFrame *f);
+int ff_get_buffer(AVCodecContext *avctx, AVFrame *f);
+void ff_release_buffer(AVFrame *f);
+void ff_delayed_release_buffer(AVCodecContext *avctx, AVFrame *f);
 #else
 static int ff_thread_init(AVCodecContext *avctx) {return 0;}
 static void ff_thread_free(AVCodecContext *avctx) {}
@@ -52,7 +52,7 @@ static void ff_frame_thread_free(AVCodecContext *avctx) {}
 #define ff_report_decode_progress(avctx) {}
 #define ff_await_decode_progress(avctx)  {}
 
-static int ff_mt_get_buffer(AVCodecContext *avctx, AVFrame *f)
+static int ff_get_buffer(AVCodecContext *avctx, AVFrame *f)
 {
     int ret = avctx->get_buffer(c, f);
 
@@ -60,12 +60,12 @@ static int ff_mt_get_buffer(AVCodecContext *avctx, AVFrame *f)
     return ret;
 }
 
-static void ff_mt_release_buffer(AVFrame *f)
+static void ff_release_buffer(AVFrame *f)
 {
     f->avctx->release_buffer(f->avctx, f);
 }
 
-#define ff_mt_delayed_release_buffer(avctx, f) ff_mt_release_buffer(f)
+#define ff_delayed_release_buffer(avctx, f) ff_release_buffer(f)
 #endif
 
 #endif /* FFMPEG_FRAMEPTHREAD_H */
-- 
1.5.5.1




_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc