Changeset 3689

Timestamp:

12/17/06 03:20:12 (2 years ago)

Author:

hverkuil

Message:

More work on speed changes.

Files:

• ivtvtv/trunk/ivtvtv.cpp (modified) (16 diffs)

ivtvtv/trunk/ivtvtv.cpp

@@ -12 +12 @@
-
-#include <string>
+
+int g_skip = 0;
+int g_spd = 0;
+int idx = 0;
-
-#if 0
@@ -55 +59 @@
-static int ivtv_api_dec_speed(int ivtvfd, int direction, int speed)
-{
-1
+2
-        int aud_mute = 0;
-        int fr_field = 0;
@@ -63 +67 @@
-        int ip_frames = 1;
-        int ipb_frames = 2;
+
+        if (speed > 2)
+                speed = 2;
-
-        /* Make input sane */
@@ -73 +80 @@
-                if (speed < 0) {
-                        __ivtv_api_dec_speed(ivtvfd,
-
++1
-                                             ipb_frames, 0, aud_mute, fr_field, mute);
-                } else if (speed == 0) {
@@ -79 +86 @@
-                                             0, 0, 0, direction, ipb_frames, 0,
-                                             aud_mute, fr_field, mute);
- || speed == 2
-
-0
+
+
+1
-                                             ipb_frames, 0, aud_mute, fr_field, mute);
-                } else {
-                        __ivtv_api_dec_speed(ivtvfd,
-0, 0, 0
+speed, 0, 1
-                                             aud_mute, fr_field, mute);
-                }
@@ -91 +98 @@
-                if (speed < 0) {
-                        __ivtv_api_dec_speed(ivtvfd,
-
++1
-                                             b_per_gop, aud_mute, fr_field, mute);
-                } else if (speed == 0) {
@@ -101 +108 @@
-                                             speed, 0, 1, direction, ip_frames,
-                                             b_per_gop, aud_mute, fr_field, mute);
-if (speed > 2) 
-
-0, 0, 0
+
+
+speed, 0, 1
-                                             b_per_gop, aud_mute, fr_field, mute);
-                } else {
-                        __ivtv_api_dec_speed(ivtvfd,
-                                             speed, 0, 1, direction,
-                                             ipb_frames, b_per_gop, aud_mute,
-                                             fr_field, mute);
-                }
-        }
@@ -119 +121 @@
-void speed(int fh, int delta)
-{
-
-
-
-
-
+
+
+
-}
-
-void process(int fh, int ch)
-{
+        struct ivtv_cfg_start_decode start;
+        struct ivtv_cfg_stop_decode stop;
-        int step = 0;
-
@@ -141 +143 @@
-                break;
-        case 'r':
+                dir = 0;
+                speed(fh, 0);
-                ioctl(fh, IVTV_IOC_PLAY, 0);
+                break;
+        case 'd':
+                dir = !dir;
+                stop.hide_last = 0;
+                stop.pts_stop = 0;
+                ioctl(fh, IVTV_IOC_STOP_DECODE, &stop);
+                start.gop_offset = 0;
+                start.muted_audio_frames = 0;
+                ioctl(fh, IVTV_IOC_START_DECODE, &start);
+                speed(fh, 0);
+                if (dir) idx -= g_skip;
+                else idx += g_skip;
+                if (idx < 0) idx = 0;
-                break;
-        case '-':
@@ -176 +193 @@
-        unsigned long long *indices;
-        int max_idx;
-        int idx = 0;
-
-        if (argc < 3) {
@@ -208 +224 @@
-                        max_sz = indices[i+1] - indices[i];
-        buf = new char[max_sz];
+        printf("max %d\n", max_sz);
-
-        //if (fin > fmax) fmax = fin;
@@ -215 +232 @@
-                exit(1);
-        }
+        int fast = 1;
+        ioctl(fout, IVTV_IOC_DEC_FAST_STOP, &fast);
+        //ioctl(fout, IVTV_IOC_DEC_SPLICE, &fast);
-        if (fout > fmax) fmax = fout;
-
-        fd_set fd_in;
-        fd_set fd_out;
+        int first = 1;
+        time_t t1, t2;
+        int cnt = 0;
+
+        t1 = time(NULL);
-
-        while (1) {
@@ -241 +266 @@
-                if (bufoffset == bufsz) {
-                        ssize_t sz;
+                        int i = idx;
-
-                        if (dir) {
@@ -247 +273 @@
-                                        break;
-                                }
---
+ -= g_spd > 2 ? g_spd-1 : 1
-                        }
-                        else {
@@ -254 +280 @@
-                                        break;
-                                }
-++
-
-dx
-dx + 1] - indices[idx
+ += g_spd > 2 ? g_spd-1 : 1
+
+
+ + 1] - indices[i
-                        sz = read(fin, buf, bufsz);
+                        struct ivtv_ioctl_framesync info;
+                        ioctl(fout, IVTV_IOC_GET_TIMING, &info);
+                        printf("frame %d %lld %d\n", info.frame, info.pts, idx);
+                        cnt++;
+                        t2 = time(NULL);
+                        if (t1 != t2) {
+//                              printf("sec %d %d\n", cnt, t2 - t1);
+                                cnt = 0;
+                                t1 = t2;
+                        }
+                        if (info.frame && first) {
+                                first = 0;
+                                g_skip = idx;
+                                printf("skip = %d\n", g_skip);
+                        }
-
-                        if (sz == 0) {
@@ -277 +318 @@
-                }
-        }
+        fast = 0;
+        ioctl(fout, IVTV_IOC_DEC_FAST_STOP, &fast);
+        struct ivtv_cfg_stop_decode stop;
+        stop.hide_last = 1;
+        stop.pts_stop = 0;
+        //ioctl(fout, IVTV_IOC_STOP_DECODE, &stop);
+        ioctl(fout, VIDIOC_STREAMOFF, 0);
-        return 0;
-}