Code compiles, now working on getting configure.ac fixed

gcasa · gcasa · commit 9664cd48fe6e · 2025-05-25T16:28:35.000-04:00
diff --git a/Headers/AppKit/NSMovie.h b/Headers/AppKit/NSMovie.h
@@ -41,8 +41,9 @@ APPKIT_EXPORT_CLASS
 @interface NSMovie : NSObject <NSCopying, NSCoding> 
 {
   @private
-    NSData*  _movie;
-    NSURL*   _url;
+    NSData*   _movie;
+    NSURL*    _url;
+    BOOL      _tmp;
 }
 
 + (NSArray*) movieUnfilteredFileTypes;
diff --git a/Headers/AppKit/NSMovieView.h b/Headers/AppKit/NSMovieView.h
@@ -32,6 +32,11 @@
 
 #import <AppKit/NSView.h>
 
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libavutil/imgutils.h>
+
 @class NSMovie;
 
 typedef enum {
@@ -56,6 +61,18 @@ APPKIT_EXPORT_CLASS
       unsigned int editable: 1;
       unsigned int reserved: 24;
     } _flags;
+    BOOL _playing;
+    NSTimer *_decodeTimer;
+
+    // libav specific...
+    NSImage *_currentFrame;
+    AVFormatContext *_formatContext;
+    AVCodecContext *_codecContext;
+    AVFrame *_avframe;
+    AVFrame *_avframeRGB;
+    struct SwsContext *_swsCtx;
+    int _videoStreamIndex;
+    uint8_t *_buffer;
 }
 
 - (void) setMovie: (NSMovie*)movie;
diff --git a/Source/NSMovie.m b/Source/NSMovie.m
@@ -30,20 +30,38 @@
 #import <Foundation/NSCoder.h>
 #import <Foundation/NSData.h>
 #import <Foundation/NSURL.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSUUID.h>
+
 #import "AppKit/NSMovie.h"
 #import "AppKit/NSPasteboard.h"
 
+NSString *_writeDataToTempFile(NSData *data)
+{
+  NSString *tempDirectory = NSTemporaryDirectory();
+  NSString *filename = [NSString stringWithFormat: @"tmpfile-%@.dat", [[NSUUID UUID] UUIDString]];
+  NSString *filepath = [tempDirectory stringByAppendingPathComponent: filename];
+  NSError *error = nil;
+
+  BOOL success = [data writeToFile: filepath options: NSDataWritingAtomic error: &error];
+  if (success)
+    {
+      return nil;
+    }
+  
+  return filepath;
+}
+
 @implementation NSMovie
 
 + (NSArray*) movieUnfilteredFileTypes
 {
-  return [NSArray arrayWithObject: @"mov"];
+  return [NSArray arrayWithObjects: @"mp4", @"mov", @"avi", @"flv", @"mkv", @"webm", nil ];
 }
 
 + (NSArray*) movieUnfilteredPasteboardTypes
 {
-  // FIXME
-  return [NSArray arrayWithObject: @"QuickTimeMovie"];
+  return [self movieUnfilteredFileTypes];
 }
 
 + (BOOL) canInitWithPasteboard: (NSPasteboard*)pasteboard
@@ -61,31 +79,33 @@ - (id) initWithData: (NSData *)movie
       RELEASE(self);
       return nil;
     }
-  
-  [super init];
-  ASSIGN(_movie, movie);
 
+  self = [super init];
+  if (self != nil)
+    {
+      NSString *filepath = _writeDataToTempFile(_movie);
+
+      _url = [NSURL fileURLWithPath: filepath];
+      _tmp = YES;
+      ASSIGN(_movie, movie);
+    }
+  
   return self;
 }
 
 - (id) initWithMovie: (void*)movie
 {
-  //FIXME
-
-  return self;
+  return [self initWithData: movie];
 }
 
 - (id) initWithURL: (NSURL*)url byReference: (BOOL)byRef
 {
-  NSData* data = [url resourceDataUsingCache: YES];
-
-  self = [self initWithData: data];
-
-  if (byRef)
+  self = [super init];
+  if (self != nil)
     {
       ASSIGN(_url, url);
     }
-
+  
   return self;
 }
 
@@ -94,12 +114,11 @@ - (id) initWithPasteboard: (NSPasteboard*)pasteboard
   NSString *type;
   NSData* data;
 
-  type = [pasteboard availableTypeFromArray: 
-			 [object_getClass(self) movieUnfilteredPasteboardTypes]];
+  type =
+    [pasteboard availableTypeFromArray: 
+		  [object_getClass(self) movieUnfilteredPasteboardTypes]];
   if (type == nil)
     {
-      //NSArray *array = [pasteboard propertyListForType: NSFilenamesPboardType];
-      // FIXME
       data = nil;
     }
   else 
@@ -120,9 +139,11 @@ - (id) initWithPasteboard: (NSPasteboard*)pasteboard
 
 - (void) dealloc
 {
+  _tmp = NO;
+  [[NSFileManager defaultManager] removeFileAtPath: [_url path] error: nil];
   TEST_RELEASE(_url);
   TEST_RELEASE(_movie);
-    
+  
   [super dealloc];
 }
 
diff --git a/Source/NSMovieView.m b/Source/NSMovieView.m
@@ -28,16 +28,125 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSData.h>
+#import <Foundation/NSTimer.h>
 #import <Foundation/NSURL.h>
+
+#import "AppKit/NSColor.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSImageRep.h"
 #import "AppKit/NSMovie.h"
 #import "AppKit/NSMovieView.h"
 #import "AppKit/NSPasteboard.h"
 
 @implementation NSMovieView
 
+// private method to display frames...
+- (void) _updateImage: (NSImage *)image
+{
+  _currentFrame = image;
+  [self setNeedsDisplay:YES];
+}
+
+- (void) _prepareDecoder
+{
+  NSString *moviePath = [[_movie URL] path];
+  
+  _formatContext = avformat_alloc_context();
+  if (avformat_open_input(&_formatContext, [moviePath UTF8String], NULL, NULL) != 0) return;
+  if (avformat_find_stream_info(_formatContext, NULL) < 0) return;
+  
+  _videoStreamIndex = -1;
+  for (int i = 0; i < _formatContext->nb_streams; i++)
+    {
+      if (_formatContext->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
+	{
+	  _videoStreamIndex = i;
+	  break;
+	}
+    }
+  
+  if (_videoStreamIndex == -1) return;
+  
+  AVCodecParameters *codecPar = _formatContext->streams[_videoStreamIndex]->codecpar;
+  const AVCodec *codec = avcodec_find_decoder(codecPar->codec_id);
+
+  _codecContext = avcodec_alloc_context3(codec);
+  avcodec_parameters_to_context(_codecContext, codecPar);
+  if (avcodec_open2(_codecContext, codec, NULL) < 0) return;
+  
+  _avframe = av_frame_alloc();
+  _avframeRGB = av_frame_alloc();
+  
+  int numBytes = av_image_get_buffer_size(AV_PIX_FMT_RGB24, _codecContext->width, _codecContext->height, 1);
+  _buffer = (uint8_t *)av_malloc(numBytes * sizeof(uint8_t));
+  av_image_fill_arrays(_avframeRGB->data, _avframeRGB->linesize, _buffer, AV_PIX_FMT_RGB24,
+		       _codecContext->width, _codecContext->height, 1);
+  
+  _swsCtx = sws_getContext(_codecContext->width, _codecContext->height, _codecContext->pix_fmt,
+			   _codecContext->width, _codecContext->height, AV_PIX_FMT_RGB24,
+			   SWS_BILINEAR, NULL, NULL, NULL);
+
+}
+
+- (void) _decodeAndDisplayNextFrame
+{
+  AVPacket packet;
+
+  av_init_packet(&packet);
+  packet.data = NULL;
+  packet.size = 0;
+  
+  while (av_read_frame(_formatContext, &packet) >= 0)
+    {
+      if (!_playing) break;
+      
+      if (packet.stream_index == _videoStreamIndex)
+	{
+	  avcodec_send_packet(_codecContext, &packet);
+	  if (avcodec_receive_frame(_codecContext, _avframe) == 0)
+	    {
+	      sws_scale(_swsCtx, (const uint8_t * const *)_avframe->data, _avframe->linesize, 0,
+			_codecContext->height, _avframeRGB->data, _avframeRGB->linesize);
+	      
+	      NSBitmapImageRep *rep = [[NSBitmapImageRep alloc]
+					initWithBitmapDataPlanes: _avframeRGB->data
+						      pixelsWide: _codecContext->width
+						      pixelsHigh: _codecContext->height
+						   bitsPerSample: 8
+						 samplesPerPixel: 3
+							hasAlpha: NO
+							isPlanar: NO
+						  colorSpaceName: NSCalibratedRGBColorSpace
+						     bytesPerRow: _avframeRGB->linesize[0]
+						    bitsPerPixel: 24];
+	      
+	      NSImage *image = [[NSImage alloc] initWithSize:NSMakeSize(_codecContext->width, _codecContext->height)];
+	      [image addRepresentation:rep];
+	      
+	      [self performSelectorOnMainThread: @selector(_updateImage:)
+				     withObject: image
+				  waitUntilDone: NO];
+	      break;
+	    }
+	}
+    av_packet_unref(&packet);
+  }
+}
+
+- (void) drawRect: (NSRect)dirtyRect
+{
+  [super drawRect: dirtyRect];
+  if (_currentFrame)
+    {
+      [_currentFrame drawInRect: [self bounds]];
+    }
+}
+
 - (void) setMovie: (NSMovie*)movie
 {
   ASSIGN(_movie, movie);
+  [self _prepareDecoder];
 }
 
 - (NSMovie*) movie
@@ -47,18 +156,39 @@ - (NSMovie*) movie
 
 - (void) start: (id)sender
 {
-  //FIXME
+  _playing = YES;
+  _rate = 1.0 / 30.0;
+  _volume = 1.0;
+  
+  _decodeTimer =
+    [NSTimer scheduledTimerWithTimeInterval: _rate
+				     target: self
+				   selector: @selector(decodeAndDisplayNextFrame)
+				   userInfo: nil
+				    repeats: YES];
 }
 
 - (void) stop: (id)sender
 {
-  //FIXME
+  _playing = NO;
+
+  if (_decodeTimer)
+    {
+      [_decodeTimer invalidate];
+      _decodeTimer = nil;
+    }
+  
+  if (_avframe) av_frame_free(&_avframe);
+  if (_avframeRGB) av_frame_free(&_avframeRGB);
+  if (_buffer) av_free(_buffer);
+  if (_codecContext) avcodec_free_context(&_codecContext);
+  if (_formatContext) avformat_close_input(&_formatContext);
+  if (_swsCtx) sws_freeContext(_swsCtx);
 }
 
 - (BOOL) isPlaying
 {
-  //FIXME
-  return NO;  
+  return _playing;  
 }
 
 - (void) gotoPosterFrame: (id)sender

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,9 @@ APPKIT_EXPORT_CLASS`
`41`	`41`	`@interface NSMovie : NSObject <NSCopying, NSCoding>`
`42`	`42`	`{`
`43`	`43`	`@private`
`44`		`- NSData* _movie;`
`45`		`- NSURL* _url;`
	`44`	`+ NSData* _movie;`
	`45`	`+ NSURL* _url;`
	`46`	`+ BOOL _tmp;`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`+ (NSArray*) movieUnfilteredFileTypes;`