Skip to content

Commit

Permalink
add isHLS stream bool to update some internal logic, add URL detectio…
Browse files Browse the repository at this point in the history 
…n to properly load HLS streams via correct API. Still not 100% working, but plays audio. Some bullshit with OF and textures or some shit. I dunno.
  • Loading branch information
@vade
vade committed Jan 12, 2015
1 parent 3b5a62a commit 58843ff
Show file tree
Hide file tree
Showing 2 changed files with 191 additions and 87 deletions.
4 changes: 4 additions & 0 deletions libs/openFrameworks/video/ofAVFMovieRenderer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
BOOL _bAudioLoaded;
BOOL _bPaused;
BOOL _bMovieDone;

BOOL _isHSLStream;
}

@property (nonatomic, retain) AVPlayer * player;
Expand All @@ -50,6 +52,8 @@
@property (nonatomic, assign, readonly, getter = isMovieDone) BOOL bMovieDone;
@property (nonatomic, assign, readonly) BOOL isPlaying;

@property (nonatomic, assign, readonly) BOOL isHSLStream;

@property (nonatomic, assign) BOOL useAlpha;
@property (nonatomic, assign) BOOL useTexture;

Expand Down
274 changes: 187 additions & 87 deletions libs/openFrameworks/video/ofAVFMovieRenderer.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ @implementation AVFMovieRenderer
@synthesize playbackRate = _playbackRate;
@synthesize bLoops = _bLoops;

@synthesize isHSLStream = _isHSLStream;

//--------------------------------------------------------------
- (id)init
{
Expand Down Expand Up @@ -66,7 +68,8 @@ - (NSDictionary *)pixelBufferAttributes
{
// kCVPixelFormatType_32ARGB, kCVPixelFormatType_32BGRA, kCVPixelFormatType_422YpCbCr8
return @{
(NSString *)kCVPixelBufferOpenGLCompatibilityKey : [NSNumber numberWithBool:self.useTexture],
(NSString*) kCVPixelBufferIOSurfacePropertiesKey : @{}, // generally want this especially on iOS
(NSString *)kCVPixelBufferOpenGLCompatibilityKey : @YES, // should never be no.
(NSString *)kCVPixelBufferPixelFormatTypeKey : [NSNumber numberWithInt:kCVPixelFormatType_32ARGB]
// [NSNumber numberWithInt:kCVPixelFormatType_422YpCbCr8]
};
Expand All @@ -87,89 +90,168 @@ - (void)loadURLPath:(NSString *)urlPath
//--------------------------------------------------------------
- (void)loadURL:(NSURL *)url
{
_bLoading = YES;
_bLoaded = NO;
_bAudioLoaded = NO;
_bPaused = NO;
_bMovieDone = NO;

_frameRate = 0.0;
_playbackRate = 1.0;

// _useTexture = YES;
// _useAlpha = NO;

NSLog(@"Loading %@", [url absoluteString]);

AVURLAsset *asset = [AVURLAsset URLAssetWithURL:url options:nil];
NSString *tracksKey = @"tracks";

[asset loadValuesAsynchronouslyForKeys:@[tracksKey] completionHandler: ^{
static const NSString *kItemStatusContext;
// Perform the following back on the main thread
dispatch_async(dispatch_get_main_queue(), ^{
// Check to see if the file loaded
NSError *error;
AVKeyValueStatus status = [asset statusOfValueForKey:tracksKey error:&error];

if (status == AVKeyValueStatusLoaded) {
// Asset metadata has been loaded, set up the player.

// Extract the video track to get the video size and other properties.
AVAssetTrack *videoTrack = [[asset tracksWithMediaType:AVMediaTypeVideo] objectAtIndex:0];
_videoSize = [videoTrack naturalSize];
_currentTime = kCMTimeZero;
_duration = asset.duration;
_frameRate = [videoTrack nominalFrameRate];

self.playerItem = [AVPlayerItem playerItemWithAsset:asset];
[self.playerItem addObserver:self forKeyPath:@"status" options:0 context:&kItemStatusContext];

// Notify this object when the player reaches the end.
// This allows us to loop the video.
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(playerItemDidReachEnd:)
name:AVPlayerItemDidPlayToEndTimeNotification
object:self.playerItem];

[self.player replaceCurrentItemWithPlayerItem:self.playerItem];

// Create and attach video output.
self.playerItemVideoOutput = [[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:[self pixelBufferAttributes]];
[self.playerItemVideoOutput autorelease];
if (self.playerItemVideoOutput) {
[(AVPlayerItemVideoOutput *)self.playerItemVideoOutput setSuppressesPlayerRendering:YES];
}
[self.player.currentItem addOutput:self.playerItemVideoOutput];

// Create CVOpenGLTextureCacheRef for optimal CVPixelBufferRef to GL texture conversion.
if (self.useTexture && !_textureCache) {
CVReturn err = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL,
CGLGetCurrentContext(), CGLGetPixelFormat(CGLGetCurrentContext()),
NULL, &_textureCache);
// (CFDictionaryRef)ctxAttributes, &_textureCache);
if (err != noErr) {
NSLog(@"Error at CVOpenGLTextureCacheCreate %d", err);
}
}

_bLoading = NO;
_bLoaded = YES;
}
else {
_bLoading = NO;
_bLoaded = NO;
NSLog(@"There was an error loading the file: %@", error);
}
});
}];
_bLoading = YES;
_bLoaded = NO;
_bAudioLoaded = NO;
_bPaused = NO;
_bMovieDone = NO;

_frameRate = 0.0;
_playbackRate = 1.0;

// _useTexture = YES;
// _useAlpha = NO;

NSLog(@"Loading %@", [url absoluteString]);

// So HLS streaming requires different loading than file asset loading local or remote mp4's / movs:
// From Apple :
// To create and prepare an HTTP live stream for playback. Initialize an instance of AVPlayerItem using the URL.
// (You cannot directly create an AVAsset instance to represent the media in an HTTP Live Stream.)

// We check if we load an HLS stream by seeing if its a .m3u8 extension. This *MIGHT* be niave
// Anyway, adjust the logic here if you doubt my commitment to sparklemotion.

BOOL isHSLURL = FALSE;

if( [[url pathExtension] isEqualToString:@"m3u8"])
isHSLURL = TRUE;

if(isHSLURL)
[self loadHLSURL:url];
else
[self loadFileURL:url];
}

//--------------------------------------------------------------
- (void) loadHLSURL:(NSURL*)url
{
CVReturn err = [self updatePlayerItem:[AVPlayerItem playerItemWithURL:url]];
if(err == kCVReturnSuccess)
{
_bLoading = NO;
_bLoaded = YES;
_isHSLStream = YES;
}
else
{
_bLoading = NO;
_bLoaded = NO;
_isHSLStream = NO;
NSLog(@"There was an error loading the file: %i", err);
}

}

//--------------------------------------------------------------
- (void) loadFileURL:(NSURL*)url
{
AVURLAsset *asset = [AVURLAsset URLAssetWithURL:url options:nil];
NSString *tracksKey = @"tracks";

[asset loadValuesAsynchronouslyForKeys:@[tracksKey] completionHandler: ^{
// Perform the following back on the main thread
dispatch_async(dispatch_get_main_queue(), ^{
// Check to see if the file loaded
NSError *error;
AVKeyValueStatus status = [asset statusOfValueForKey:tracksKey error:&error];

NSLog(@"Asset Tracks: %@", asset.tracks);

if (status == AVKeyValueStatusLoaded) {
// Asset metadata has been loaded, set up the player.

// Extract the video track to get the video size and other properties.
if([[asset tracksWithMediaCharacteristic:AVMediaCharacteristicVisual] count])
{

CVReturn err = [self updatePlayerItem:[AVPlayerItem playerItemWithAsset:asset]];

if(err == kCVReturnSuccess)
{
_bLoading = NO;
_bLoaded = YES;
_isHSLStream = NO;
}
else
{
_bLoading = NO;
_bLoaded = NO;
_isHSLStream = NO;
NSLog(@"There was an error loading the file: %@", error);
}
}
}
else {
_bLoading = NO;
_bLoaded = NO;
_isHSLStream = NO;
NSLog(@"There was an error loading the file: %@", error);
}
});
}];
}

- (CVReturn) updatePlayerItem:(AVPlayerItem*)newPlayerItem
{
static const NSString *kItemStatusContext;

self.playerItem = newPlayerItem;
NSLog(@"Tracks: %@", self.playerItem.tracks);


AVAssetTrack *videoTrack = [[self.playerItem.asset tracksWithMediaCharacteristic:AVMediaCharacteristicVisual] firstObject];
if(videoTrack) // HLS streams tend to not want to report tracks because I dont know
_videoSize = [videoTrack naturalSize];
else
_videoSize = [self.playerItem presentationSize];

NSLog(@"Video Size: %@", NSStringFromSize(NSSizeFromCGSize(_videoSize)));

_currentTime = kCMTimeZero;
_duration = self.playerItem.asset.duration;
_frameRate = [videoTrack nominalFrameRate];

[self.playerItem addObserver:self forKeyPath:@"status" options:0 context:&kItemStatusContext];

// Notify this object when the player reaches the end.
// This allows us to loop the video.
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(playerItemDidReachEnd:)
name:AVPlayerItemDidPlayToEndTimeNotification
object:self.playerItem];

[self.player replaceCurrentItemWithPlayerItem:self.playerItem];

// Create and attach video output.
self.playerItemVideoOutput = [[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:[self pixelBufferAttributes]];
// [self.playerItemVideoOutput autorelease];
if (self.playerItemVideoOutput) {
[(AVPlayerItemVideoOutput *)self.playerItemVideoOutput setSuppressesPlayerRendering:YES];
}
[self.player.currentItem addOutput:self.playerItemVideoOutput];

// Create CVOpenGLTextureCacheRef for optimal CVPixelBufferRef to GL texture conversion.
if (self.useTexture && !_textureCache) {
CVReturn err = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL,
CGLGetCurrentContext(), CGLGetPixelFormat(CGLGetCurrentContext()),
NULL, &_textureCache);
// (CFDictionaryRef)ctxAttributes, &_textureCache);
if (err != noErr) {
NSLog(@"Error at CVOpenGLTextureCacheCreate %d", err);
}

return err;
}

return kCVReturnSuccess;
}

//--------------------------------------------------------------
- (void)dealloc
{
[self stop];
self.playerItemVideoOutput = nil;

if (_textureCache != NULL) {
Expand All @@ -184,9 +266,9 @@ - (void)dealloc
CVPixelBufferRelease(_latestPixelFrame);
_latestPixelFrame = NULL;
}
[[NSNotificationCenter defaultCenter] removeObserver:self];
if (self.playerItem) {
[self.playerItem removeObserver:self forKeyPath:@"status"];
self.playerItem = nil;
Expand Down Expand Up @@ -281,7 +363,7 @@ - (BOOL)update
if (err != noErr) {
NSLog(@"Error creating OpenGL texture %d", err);
}
}
}

// Update time.
_currentTime = self.player.currentItem.currentTime;
Expand Down Expand Up @@ -317,12 +399,12 @@ - (void)pixels:(unsigned char *)outbuf
// CVPixelBufferGetHeight(_latestPixelFrame),
// CVPixelBufferGetBytesPerRow(_latestPixelFrame),
// (NSInteger)movieSize.width, (NSInteger)movieSize.height);
if ((NSInteger)self.width != CVPixelBufferGetWidth(_latestPixelFrame) || (NSInteger)self.height != CVPixelBufferGetHeight(_latestPixelFrame)) {
NSLog(@"CoreVideo pixel buffer is %ld x %ld while self reports size of %ld x %ld. This is most likely caused by a non-square pixel video format such as HDV. Open this video in texture only mode to view it at the appropriate size.",
CVPixelBufferGetWidth(_latestPixelFrame), CVPixelBufferGetHeight(_latestPixelFrame), (long)self.width, (long)self.height);
return;
}
// if ((NSInteger)self.width != CVPixelBufferGetWidth(_latestPixelFrame) || (NSInteger)self.height != CVPixelBufferGetHeight(_latestPixelFrame)) {
// NSLog(@"CoreVideo pixel buffer is %ld x %ld while self reports size of %ld x %ld. This is most likely caused by a non-square pixel video format such as HDV. Open this video in texture only mode to view it at the appropriate size.",
// CVPixelBufferGetWidth(_latestPixelFrame), CVPixelBufferGetHeight(_latestPixelFrame), (long)self.width, (long)self.height);
// return;
// }
if (CVPixelBufferGetPixelFormatType(_latestPixelFrame) != kCVPixelFormatType_32ARGB) {
NSLog(@"CoreVideo frame pixelformat not kCVPixelFormatType_32ARGB: %d, instead %ld", kCVPixelFormatType_32ARGB, (long)CVPixelBufferGetPixelFormatType(_latestPixelFrame));
return;
Expand Down Expand Up @@ -439,6 +521,12 @@ - (int)currentFrame
//--------------------------------------------------------------
- (void)setCurrentFrame:(int)currentFrame
{
if(_isHSLStream)
{
// ofLogWarning("ofAVFoundationPlayer::setCurrentFrame Not supported with HLS Stream");
return;
}

float position = currentFrame / (float)self.totalFrames;
[self setPosition:position];
}
Expand All @@ -452,13 +540,25 @@ - (double)position
//--------------------------------------------------------------
- (void)setPosition:(double)position
{
if(_isHSLStream)
{
// ofLogWarning("ofAVFoundationPlayer::setPosition Not supported with HLS Stream");
return;
}

double time = self.duration * position;
[self setCurrentTime:time];
}

//--------------------------------------------------------------
- (void)setPlaybackRate:(double)playbackRate
{
if(_isHSLStream)
{
// ofLogWarning("ofAVFoundationPlayer::setPlaybackRate Not supported with HLS Stream");
return;
}

_playbackRate = playbackRate;
[_player setRate:_playbackRate];
}
Expand Down

0 comments on commit 58843ff

Please sign in to comment.