Changeset 3335 for trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

Timestamp:

Feb 24, 2013, 5:46:58 PM (12 years ago)

Author:

gah

Message:

fixes for new version of ffmeg

File:

• trunk/packages/vizservers/nanovis/RpAVTranslate.cpp (modified) (8 diffs)

trunk/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 HAVE_AVCODEC_OPEN2
+#define avcodec_open(context, codec, options)   avcodec_open2(contex, codec, NULL)
+#endif
+
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ -120 +132 @@
     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 +194 @@
     /* 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 +292 @@
 
     AVStream *streamPtr;
-    streamPtr = av_new_stream(_ocPtr, 0);
+    streamPtr = avformat_new_stream(_ocPtr, 0);
     if (streamPtr == NULL) {
         status.addError("Could not alloc stream");
@@ -359 +374 @@
     AVCodec *codec;
     AVCodecContext *c;
+    int result;
 
     status.addContext("Rappture::AVTranslate::openVideo()");
@@ -369 +385 @@
         return false;
     }
-
+#ifdef HAVE_AVCODEC_OPEN2
+    result = avcodec_open2(c, codec, NULL);
+#else 
+    result = avcodec_open2(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 +420 @@
 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 +439 @@
     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;
     }