mxfenc: always assume long gop

[ffmpeg] / libavformat / img2enc.c

diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 6273af94f8935b0239a5d03dd1647b43b2aa7cee..d5b664658fa1fbd005ee405c1f49779bbce17cc9 100644 (file)
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -28,11 +28,13 @@
 #include "internal.h"
 #include "libavutil/opt.h"
 
-typedef struct {
+typedef struct VideoMuxData {
     const AVClass *class;  /**< Class for private options. */
     int img_number;
     int is_pipe;
     char path[1024];
+    char tmp[1024];
+    int update;
 } VideoMuxData;
 
 static int write_header(AVFormatContext *s)
@@ -40,6 +42,7 @@ static int write_header(AVFormatContext *s)
     VideoMuxData *img = s->priv_data;
 
     av_strlcpy(img->path, s->filename, sizeof(img->path));
+    snprintf(img->tmp, sizeof(img->tmp), "%s.tmp", s->filename);
 
     /* find format */
     if (s->oformat->flags & AVFMT_NOFILE)
@@ -55,47 +58,48 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     VideoMuxData *img = s->priv_data;
     AVIOContext *pb[3];
     char filename[1024];
-    AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec;
+    AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
     int i;
 
     if (!img->is_pipe) {
-        if (av_get_frame_filename(filename, sizeof(filename),
-                                  img->path, img->img_number) < 0 && img->img_number>1) {
+        if (img->update) {
+            av_strlcpy(filename, img->path, sizeof(filename));
+        } else if (av_get_frame_filename(filename, sizeof(filename), img->path, img->img_number) < 0 &&
+                   img->img_number > 1) {
             av_log(s, AV_LOG_ERROR,
                    "Could not get frame filename number %d from pattern '%s'\n",
                    img->img_number, img->path);
             return AVERROR(EIO);
         }
-        for(i=0; i<3; i++){
-            if (avio_open2(&pb[i], filename, AVIO_FLAG_WRITE,
+        for (i = 0; i < 3; i++) {
+            if (avio_open2(&pb[i], img->tmp, AVIO_FLAG_WRITE,
                            &s->interrupt_callback, NULL) < 0) {
-                av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename);
+                av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", img->tmp);
                 return AVERROR(EIO);
             }
 
-            if(codec->codec_id != AV_CODEC_ID_RAWVIDEO)
+            if (codec->codec_id != AV_CODEC_ID_RAWVIDEO)
                 break;
-            filename[ strlen(filename) - 1 ]= 'U' + i;
+            filename[strlen(filename) - 1] = 'U' + i;
         }
     } else {
         pb[0] = s->pb;
     }
 
-    if(codec->codec_id == AV_CODEC_ID_RAWVIDEO){
+    if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) {
         int ysize = codec->width * codec->height;
-        avio_write(pb[0], pkt->data        , ysize);
-        avio_write(pb[1], pkt->data + ysize, (pkt->size - ysize)/2);
-        avio_write(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2);
-        avio_flush(pb[1]);
-        avio_flush(pb[2]);
+        avio_write(pb[0], pkt->data, ysize);
+        avio_write(pb[1], pkt->data + ysize,                           (pkt->size - ysize) / 2);
+        avio_write(pb[2], pkt->data + ysize + (pkt->size - ysize) / 2, (pkt->size - ysize) / 2);
         avio_close(pb[1]);
         avio_close(pb[2]);
-    }else{
-        if(ff_guess_image2_codec(s->filename) == AV_CODEC_ID_JPEG2000){
+    } else {
+        if (ff_guess_image2_codec(s->filename) == AV_CODEC_ID_JPEG2000) {
             AVStream *st = s->streams[0];
-            if(st->codec->extradata_size > 8 &&
-               AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){
-                if(pkt->size < 8 || AV_RL32(pkt->data+4) != MKTAG('j','p','2','c'))
+            if (st->codec->extradata_size > 8 &&
+                AV_RL32(st->codec->extradata + 4) == MKTAG('j', 'p', '2', 'h')) {
+                if (pkt->size < 8 ||
+                    AV_RL32(pkt->data + 4) != MKTAG('j', 'p', '2', 'c'))
                     goto error;
                 avio_wb32(pb[0], 12);
                 ffio_wfourcc(pb[0], "jP  ");
@@ -106,10 +110,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
                 avio_wb32(pb[0], 0);
                 ffio_wfourcc(pb[0], "jp2 ");
                 avio_write(pb[0], st->codec->extradata, st->codec->extradata_size);
-            }else if(pkt->size < 8 ||
-                     (!st->codec->extradata_size &&
-                      AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature
-            error:
+            } else if (pkt->size < 8 ||
+                       (!st->codec->extradata_size &&
+                        AV_RL32(pkt->data + 4) != MKTAG('j', 'P', ' ', ' '))) { // signature
+error:
                 av_log(s, AV_LOG_ERROR, "malformed JPEG 2000 codestream\n");
                 return -1;
             }
@@ -119,6 +123,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     avio_flush(pb[0]);
     if (!img->is_pipe) {
         avio_close(pb[0]);
+        ff_rename(img->tmp, filename);
     }
 
     img->img_number++;
@@ -128,7 +133,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
 #define OFFSET(x) offsetof(VideoMuxData, x)
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption muxoptions[] = {
-    { "start_number", "first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, ENC },
+    { "start_number", "first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, ENC },
+    { "update",       "continuously overwrite one file", OFFSET(update),  AV_OPT_TYPE_INT, { .i64 = 0 }, 0,       1, ENC },
     { NULL },
 };
 
@@ -145,7 +151,7 @@ AVOutputFormat ff_image2_muxer = {
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
     .extensions     = "bmp,dpx,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
                       "ppm,sgi,tga,tif,tiff,jp2,xwd,sun,ras,rs,im1,im8,im24,"
-                      "sunras,xbm",
+                      "sunras,webp,xbm,j2c,pix",
     .priv_data_size = sizeof(VideoMuxData),
     .video_codec    = AV_CODEC_ID_MJPEG,
     .write_header   = write_header,