Changeset 3338 for branches

Timestamp:

Feb 24, 2013, 8:40:13 PM (11 years ago)

Author:

ldelgass

Message:

Sync with trunk (ffmpeg updates)

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• packages/vizservers/configure (modified) (2 diffs)
• packages/vizservers/configure.in (modified) (1 diff)
• packages/vizservers/nanovis/RpAVTranslate.cpp (modified) (8 diffs)
• packages/vizservers/nanovis/nvconf.h.in (modified) (3 diffs)

branches/nanovis2/packages/vizservers/configure

@@ -8662 +8662 @@
 fi
 
+for ac_func in avcodec_register_all
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_register_all" "ac_cv_func_avcodec_register_all"
+if test "x$ac_cv_func_avcodec_register_all" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_REGISTER_ALL 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avcodec_init
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_init" "ac_cv_func_avcodec_init"
+if test "x$ac_cv_func_avcodec_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_INIT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avformat_new_stream
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_new_stream" "ac_cv_func_avformat_new_stream"
+if test "x$ac_cv_func_avformat_new_stream" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_NEW_STREAM 1
+_ACEOF
+
+fi
+done
+
+for ac_func in av_new_stream
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_new_stream" "ac_cv_func_av_new_stream"
+if test "x$ac_cv_func_av_new_stream" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_NEW_STREAM 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avcodec_open
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_open" "ac_cv_func_avcodec_open"
+if test "x$ac_cv_func_avcodec_open" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_OPEN 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avcodec_open2
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_open2" "ac_cv_func_avcodec_open2"
+if test "x$ac_cv_func_avcodec_open2" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_OPEN2 1
+_ACEOF
+
+fi
+done
+
 for ac_func in avcodec_decode_video2
 do :
@@ -8679 +8745 @@
   cat >>confdefs.h <<_ACEOF
 #define HAVE_AVCODEC_DECODE_VIDEO 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avcodec_encode_video2
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_encode_video2" "ac_cv_func_avcodec_encode_video2"
+if test "x$ac_cv_func_avcodec_encode_video2" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_ENCODE_VIDEO2 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avcodec_encode_video
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_encode_video" "ac_cv_func_avcodec_encode_video"
+if test "x$ac_cv_func_avcodec_encode_video" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_ENCODE_VIDEO 1
 _ACEOF
 

branches/nanovis2/packages/vizservers/configure.in

@@ -276 +276 @@
 AC_CHECK_LIB(avformat, main,,AC_MSG_ERROR(requires libavformat))
 AC_CHECK_LIB(swscale, main)
+AC_CHECK_FUNCS(avcodec_register_all)
+AC_CHECK_FUNCS(avcodec_init)
+AC_CHECK_FUNCS(avformat_new_stream)
+AC_CHECK_FUNCS(av_new_stream)
+AC_CHECK_FUNCS(avcodec_open)
+AC_CHECK_FUNCS(avcodec_open2)
 AC_CHECK_FUNCS(avcodec_decode_video2)
 AC_CHECK_FUNCS(avcodec_decode_video)
+AC_CHECK_FUNCS(avcodec_encode_video2)
+AC_CHECK_FUNCS(avcodec_encode_video)
 AC_CHECK_FUNCS(avformat_open_input)
 AC_CHECK_FUNCS(av_open_input_file)

branches/nanovis2/packages/vizservers/nanovis/RpAVTranslate.cpp

@@ -59 +59 @@
 #endif  /*HAVE_AVIO_CLOSE*/
 
+#ifndef AVIO_FLAG_WRITE
+#define AVIO_FLAG_WRITE         URL_WRONLY
+#endif
+
+#ifndef HAVE_AVFORMAT_NEW_STREAM
+#define avformat_new_stream     av_new_stream
+#endif
+
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ -120 +128 @@
     status.addContext("Rappture::AVTranslate::init()");
     /* Initialize libavcodec, and register all codecs and formats */
+#ifdef HAVE_AVCODEC_REGISTER_ALL
+    avcodec_register_all();
+#else
     avcodec_init();
-    avcodec_register_all();
+#endif
     av_register_all();
 
@@ -179 +190 @@
     /* Open the output file, if needed. */
     if (!(_fmtPtr->flags & AVFMT_NOFILE)) {
-        if (avio_open(&_ocPtr->pb, filename, URL_WRONLY) < 0) {
+        if (avio_open(&_ocPtr->pb, filename, AVIO_FLAG_WRITE) < 0) {
             status.addError("Could not open '%s'", filename);
             return false;
@@ -277 +288 @@
 
     AVStream *streamPtr;
-    streamPtr = av_new_stream(_ocPtr, 0);
+    streamPtr = avformat_new_stream(_ocPtr, 0);
     if (streamPtr == NULL) {
         status.addError("Could not alloc stream");
@@ -359 +370 @@
     AVCodec *codec;
     AVCodecContext *c;
+    int result;
 
     status.addContext("Rappture::AVTranslate::openVideo()");
@@ -369 +381 @@
         return false;
     }
-
+#ifdef HAVE_AVCODEC_OPEN2
+    result = avcodec_open2(c, codec, NULL);
+#else 
+    result = avcodec_open(c, codec);
+#endif
     /* open the codec */
-    if (avcodec_open(c, codec) < 0) {
+    if (result < 0) {
         status.addError("can't open codec %d", c->codec->id);
         return false;
@@ -400 +416 @@
 AVTranslate::writeVideoFrame(Outcome &status)
 {
-    AVCodecContext *codecPtr;
+    AVCodecContext *contextPtr;
 
     status.addContext("Rappture::AVTranslate::writeVideoframe()");
-    codecPtr = _avStreamPtr->codec;
+    contextPtr = _avStreamPtr->codec;
 
     /* encode the image */
     int size;
-    size = avcodec_encode_video(codecPtr, _videoOutbuf, _videoOutbufSize, 
+    size = avcodec_encode_video(contextPtr, _videoOutbuf, _videoOutbufSize, 
         _pictPtr);
     if (size < 0) {
@@ -419 +435 @@
     av_init_packet(&pkt);
 
-    pkt.pts = av_rescale_q(codecPtr->coded_frame->pts, codecPtr->time_base,
+    pkt.pts = av_rescale_q(contextPtr->coded_frame->pts, contextPtr->time_base,
                            _avStreamPtr->time_base);
-    if (codecPtr->coded_frame->key_frame) {
+    if (contextPtr->coded_frame->key_frame) {
         pkt.flags |= AV_PKT_FLAG_KEY;
     }

branches/nanovis2/packages/vizservers/nanovis/nvconf.h.in

@@ -16 +16 @@
 #undef HAVE_AVCODEC_DECODE_VIDEO2
 
+/* Define to 1 if you have the `avcodec_encode_video' function. */
+#undef HAVE_AVCODEC_ENCODE_VIDEO
+
+/* Define to 1 if you have the `avcodec_encode_video2' function. */
+#undef HAVE_AVCODEC_ENCODE_VIDEO2
+
+/* Define to 1 if you have the `avcodec_init' function. */
+#undef HAVE_AVCODEC_INIT
+
+/* Define to 1 if you have the `avcodec_open' function. */
+#undef HAVE_AVCODEC_OPEN
+
+/* Define to 1 if you have the `avcodec_open2' function. */
+#undef HAVE_AVCODEC_OPEN2
+
+/* Define to 1 if you have the `avcodec_register_all' function. */
+#undef HAVE_AVCODEC_REGISTER_ALL
+
 /* Define to 1 if you have the `avformat_alloc_context' function. */
 #undef HAVE_AVFORMAT_ALLOC_CONTEXT
 
+/* Define to 1 if you have the `avformat_new_stream' function. */
+#undef HAVE_AVFORMAT_NEW_STREAM
+
 /* Define to 1 if you have the `avformat_open_input' function. */
 #undef HAVE_AVFORMAT_OPEN_INPUT
@@ -43 +64 @@
 #undef HAVE_AV_GUESS_FORMAT
 
+/* Define to 1 if you have the `av_new_stream' function. */
+#undef HAVE_AV_NEW_STREAM
+
 /* Define to 1 if you have the `av_open_input_file' function. */
 #undef HAVE_AV_OPEN_INPUT_FILE
@@ -165 +189 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
 
 /* Define to the version of this package. */