Etsi identifies DTS audio with stream_private+descriptor 0x7b (in the PMT).

[ffmpeg] / libavformat / dc1394.c

diff --git a/libavformat/dc1394.c b/libavformat/dc1394.c
index 513205214b6ff766b1f1888ce7bfe26451bb47ec..c51d120af2591222e2aa2f558c61ec7da62f8b6d 100644 (file)
--- a/libavformat/dc1394.c
+++ b/libavformat/dc1394.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avformat.h"
@@ -69,67 +69,67 @@ static int dc1394_read_header(AVFormatContext *c, AVFormatParameters * ap)
 
     for (fmt = dc1394_frame_formats; fmt->width; fmt++)
          if (fmt->pix_fmt == ap->pix_fmt && fmt->width == ap->width && fmt->height == ap->height)
-            break;
-            
+             break;
+
     for (fps = dc1394_frame_rates; fps->frame_rate; fps++)
-         if (fps->frame_rate == av_rescale(1000, ap->frame_rate, ap->frame_rate_base))
-            break;
-    
+         if (fps->frame_rate == av_rescale(1000, ap->time_base.den, ap->time_base.num))
+             break;
+
     /* create a video stream */
     vst = av_new_stream(c, 0);
     if (!vst)
-       return -1;
+        return -1;
     av_set_pts_info(vst, 64, 1, 1000);
-    vst->codec.codec_type = CODEC_TYPE_VIDEO;
-    vst->codec.codec_id = CODEC_ID_RAWVIDEO;
-    vst->codec.frame_rate = fps->frame_rate;
-    vst->codec.frame_rate_base = 1000;
-    vst->codec.width = fmt->width;
-    vst->codec.height = fmt->height;
-    vst->codec.pix_fmt = fmt->pix_fmt;
+    vst->codec->codec_type = CODEC_TYPE_VIDEO;
+    vst->codec->codec_id = CODEC_ID_RAWVIDEO;
+    vst->codec->time_base.den = fps->frame_rate;
+    vst->codec->time_base.num = 1000;
+    vst->codec->width = fmt->width;
+    vst->codec->height = fmt->height;
+    vst->codec->pix_fmt = fmt->pix_fmt;
 
     /* packet init */
     av_init_packet(&dc1394->packet);
     dc1394->packet.size = avpicture_get_size(fmt->pix_fmt, fmt->width, fmt->height);
     dc1394->packet.stream_index = vst->index;
     dc1394->packet.flags |= PKT_FLAG_KEY;
-    
+
     dc1394->current_frame = 0;
     dc1394->fps = fps->frame_rate;
 
-    vst->codec.bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000);
-    
+    vst->codec->bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000);
+
     /* Now lets prep the hardware */
     dc1394->handle = dc1394_create_handle(0); /* FIXME: gotta have ap->port */
     if (!dc1394->handle) {
-       av_log(c, AV_LOG_ERROR, "Can't acquire dc1394 handle on port %d\n", 0 /* ap->port */);
+        av_log(c, AV_LOG_ERROR, "Can't acquire dc1394 handle on port %d\n", 0 /* ap->port */);
         goto out;
     }
     camera_nodes = dc1394_get_camera_nodes(dc1394->handle, &res, 1);
     if (!camera_nodes || camera_nodes[ap->channel] == DC1394_NO_CAMERA) {
         av_log(c, AV_LOG_ERROR, "There's no IIDC camera on the channel %d\n", ap->channel);
-        goto out_handle; 
+        goto out_handle;
     }
-    res = dc1394_dma_setup_capture(dc1394->handle, camera_nodes[ap->channel], 
-                                  0,
-                                  FORMAT_VGA_NONCOMPRESSED,
-                                  fmt->frame_size_id,
-                                  SPEED_400,
-                                  fps->frame_rate_id, 8, 1, 
-                                  ap->device, 
-                                  &dc1394->camera);
+    res = dc1394_dma_setup_capture(dc1394->handle, camera_nodes[ap->channel],
+                                   0,
+                                   FORMAT_VGA_NONCOMPRESSED,
+                                   fmt->frame_size_id,
+                                   SPEED_400,
+                                   fps->frame_rate_id, 8, 1,
+                                   ap->device,
+                                   &dc1394->camera);
     dc1394_free_camera_nodes(camera_nodes);
     if (res != DC1394_SUCCESS) {
         av_log(c, AV_LOG_ERROR, "Can't prepare camera for the DMA capture\n");
-       goto out_handle;
+        goto out_handle;
     }
 
     res = dc1394_start_iso_transmission(dc1394->handle, dc1394->camera.node);
     if (res != DC1394_SUCCESS) {
         av_log(c, AV_LOG_ERROR, "Can't start isochronous transmission\n");
-       goto out_handle_dma;
+        goto out_handle_dma;
     }
-    
+
     return 0;
 
 out_handle_dma:
@@ -145,25 +145,25 @@ static int dc1394_read_packet(AVFormatContext *c, AVPacket *pkt)
 {
     struct dc1394_data *dc1394 = c->priv_data;
     int res;
-    
+
     /* discard stale frame */
     if (dc1394->current_frame++) {
-       if (dc1394_dma_done_with_buffer(&dc1394->camera) != DC1394_SUCCESS)
+        if (dc1394_dma_done_with_buffer(&dc1394->camera) != DC1394_SUCCESS)
             av_log(c, AV_LOG_ERROR, "failed to release %d frame\n", dc1394->current_frame);
     }
-    
+
     res = dc1394_dma_single_capture(&dc1394->camera);
 
     if (res == DC1394_SUCCESS) {
-        dc1394->packet.data = (uint8_t *)(dc1394->camera.capture_buffer); 
-        dc1394->packet.pts = (dc1394->current_frame * 1000000) / dc1394->fps; 
-       res = dc1394->packet.size;
+        dc1394->packet.data = (uint8_t *)(dc1394->camera.capture_buffer);
+        dc1394->packet.pts = (dc1394->current_frame * 1000000) / dc1394->fps;
+        res = dc1394->packet.size;
     } else {
         av_log(c, AV_LOG_ERROR, "DMA capture failed\n");
         dc1394->packet.data = NULL;
-        res = -1;      
+        res = -1;
     }
-    
+
     *pkt = dc1394->packet;
     return res;
 }
@@ -176,7 +176,7 @@ static int dc1394_close(AVFormatContext * context)
     dc1394_dma_unlisten(dc1394->handle, &dc1394->camera);
     dc1394_dma_release_camera(dc1394->handle, &dc1394->camera);
     dc1394_destroy_handle(dc1394->handle);
-    
+
     return 0;
 }