Changeset 66e0a72e52b6c9076ab19cebe52ae0ada6898d4a for oggzcap/src/MyController.mm

Timestamp:

02/21/10 23:22:58 (2 years ago)

Author:

Robin Gareus <rgareus@…>

Parents:

9759199714df0cd85f695766c4c5c5d712570365

Children:

6e49c3474539a6c60ade3911897032696b324db7

git-committer:

Robin Gareus <rgareus@priroda.local> / 2010-02-22T00:22:58Z+0100

Message:

sending to TAC! works again...

Files:

• oggzcap/src/MyController.mm (modified) (7 diffs)

oggzcap/src/MyController.mm

@@ -200 +200 @@
         
         lockF = [NSRecursiveLock new] ;
-#if 0
-        // SOFTVDIGX Things...
-        // In Video Sequence Grabber INIT
-        mGrabber = [[SeqGrab alloc] init];
-        [mGrabber setIdleFrequency:50];
-        [[NSNotificationCenter defaultCenter] 
-                addObserver:self selector:@selector(seqGrabChannelAdded:) 
-                name:SeqGrabChannelAddedNotification object:mGrabber];
-        [[NSNotificationCenter defaultCenter] 
-                addObserver:self selector:@selector(seqGrabChannelRemoved:) 
-                name:SeqGrabChannelRemovedNotification object:mGrabber];        
-#endif          
+        
         videOpened = FALSE ;
         
@@ -300 +289 @@
         const char* curl   = [tmpStrAuthorURL UTF8String];
 
-        int iceConnect = 1; // myOggfwd_init(cip, tmpIcecastPort, (const char*) cmount, cdesc, ctags, cname, curl) ;
+        int iceConnect = myOggfwd_init(cip, tmpIcecastPort, (const char*) cmount, cdesc, ctags, cname, curl) ;
         
         if(iceConnect==1) {
@@ -311 +300 @@
                 int vidH = (int)captureRect.size.height ;
                 
-        //      encoder_example_init(vidW, vidH, outFramerate, outBitrate, outQuality) ;
+                encoder_example_init(vidW, vidH, outFramerate, outBitrate, outQuality) ;
                 
                 ////////////////////////////////////////////////////////////
@@ -389 +378 @@
                 
         ////////////////// Stop and clean encoder & oggfwd
-        //myOggfwd_close() ;
-        //encoder_example_end() ;
+        myOggfwd_close() ;
+        encoder_example_end() ;
         totalFrames = 0 ;
         
@@ -475 +464 @@
         if (filledReaderObj)
         {
-                [self pLog:[NSString stringWithFormat:@"Processing: %d\n",totalFrames]] ;
+                //[self pLog:[NSString stringWithFormat:@"Processing: %d\n",totalFrames]] ;
 
                 // get the frame and process it (processImage)
                 theNewImageBuffer = [filledReaderObj readScreenAsyncFinish] ;
-        
+#if 0   
                 if (theNewImageBuffer != NULL) {
                         [self pLog:[NSString stringWithFormat:@"frame %d\n", CVPixelBufferGetWidth(theNewImageBuffer) ]] ;
                 }
+#endif
                 ////////////////////////////////////////////////////////////////////
                 // Update Image Preview
@@ -499 +489 @@
                 // Encode Frame (result is forwarded to myOggfwd)
                 ////////////////////////////////////////////////////////////////////
-                int res = 1; // encoder_example_loop( theNewImageBuffer ) ;
+                int res = encoder_example_loop( theNewImageBuffer ) ;
                 //[NSThread detachNewThreadSelector:@selector(encodeFrame:) toTarget:self withObject:localBuff]; // OLD [to file] part
         
@@ -514 +504 @@
 {
         CVPixelBufferRef givenBuff = (CVPixelBufferRef)myBuff ;
-        int res = 1; // encoder_example_loop( givenBuff ) ;     
+        int res = encoder_example_loop( givenBuff ) ;   
 }