V2.10.0 (#35)

* Update TIP to v2.10.0

- Fix MP4 decoder when decoding anamorphic mp4s into animations
- drop iOS 7 support
- fix miscellaneous bugs
- clean up misc style
- fix tvOS support
- add tvOS target

Author: NSProgrammer

.travis.yml

@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode9.4
 script:
   ./build.sh

CHANGELOG.md

@@ -2,14 +2,23 @@
 
 ## Info
 
-**Document version:** 2.9.3
+**Document version:** 2.10.0
 
-**Last updated:** 05/16/2018
+**Last updated:** 08/17/2018
 
 **Author:** Nolan O'Brien
 
 ## History
 
+### 2.10.0
+
+- drop support for iOS 7
+  - the code had already diverged to requiring many iOS 8+ only APIs, this just makes it official
+
+### 2.9.4 - Armand Raynor
+
+- Fix MP4 decoder when decoding anamorphic mp4s into animations
+
 ### 2.9.3
 
 - Add `notifyAllFetchHelpersToRetryFailedLoads` class method to `TIPImageViewFetchHelper`

Extended/TIPXMP4Codec.m

@@ -62,10 +62,16 @@ __strong tipx_defer_block_t tipx_macro_concat(tipx_stack_defer_block_, __LINE__)
 };
 static const size_t kSignatureDataRequiredToCheck = sizeof(kComplexSignature1) + 4;
 
+static const CGFloat kAdjustmentEpsilon = (CGFloat)0.005;
+
 #pragma mark - Declarations
 
 static CGImageRef __nullable TIPX_CGImageCreateFromCMSampleBuffer(CMSampleBufferRef __nullable sample) CF_RETURNS_RETAINED;
 
+static BOOL TIPX_imageNeedsScaling(CGImageRef imageRef, CGSize naturalSize);
+
+static UIImage *TIPX_scaledImage(CGImageRef imageRef, CGSize naturalSize, CIContext *context);
+
 @interface TIPXMP4DecoderConfigInternal : NSObject <TIPXMP4DecoderConfig>
 - (instancetype)initWithMaxDecodableFramesCount:(NSUInteger)max;
 @end
@@ -214,15 +220,24 @@ - (TIPImageContainer *)_tipx_firstFrameImageContainer
         if (_temporaryFile || _finalized) {
             @autoreleasepool {
                 AVAsset *asset = [AVAsset assetWithURL:[NSURL fileURLWithPath:self->_temporaryFilePath]];
-                AVAssetImageGenerator* imageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:asset];
+                AVAssetImageGenerator *imageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:asset];
                 CGImageRef imageRef = [imageGenerator copyCGImageAtTime:CMTimeMake(0, 1)
                                                              actualTime:nil
                                                                   error:nil];
+                TIPXDeferRelease(imageRef);
+
                 if (imageRef) {
-                    UIImage* image = [UIImage imageWithCGImage:imageRef
-                                                         scale:[UIScreen mainScreen].scale
-                                                   orientation:UIImageOrientationUp];
-                    CFRelease(imageRef);
+                    AVAssetTrack *track = [asset tracksWithMediaType:AVMediaTypeVideo].firstObject;
+                    CGSize naturalSize = track.naturalSize;
+                    UIImage *image;
+                    if (track && TIPX_imageNeedsScaling(imageRef, naturalSize)) {
+                        image = TIPX_scaledImage(imageRef, naturalSize, [[CIContext alloc] init]);
+                    }
+                    if (!image) {
+                        image = [UIImage imageWithCGImage:imageRef
+                                                    scale:[UIScreen mainScreen].scale
+                                              orientation:UIImageOrientationUp];
+                    }
                     if (image) {
                         self->_firstFrame = image;
                     }
@@ -267,6 +282,8 @@ - (nullable TIPImageContainer *)renderImageWithMode:(TIPImageDecoderRenderMode)m
                                                                      message:error.description];
             return;
         }
+        
+        CGSize naturalSize = self->_avTrack.naturalSize;
 
         NSDictionary *outputSettings = @{
                                          (NSString *)kCVPixelBufferPixelFormatTypeKey : @(kCVPixelFormatType_32BGRA)
@@ -288,25 +305,32 @@ - (nullable TIPImageContainer *)renderImageWithMode:(TIPImageDecoderRenderMode)m
             mod++;
         }
 
-        CMSampleBufferRef sample = NULL;
-        do {
-            sample = [output copyNextSampleBuffer];
-            TIPXDeferRelease(sample);
-
-            if (mod > 1 && ((++count % mod) != 1)) {
-                continue;
-            }
+            CIContext *context;
 
-            CGImageRef imageRef = TIPX_CGImageCreateFromCMSampleBuffer(sample);
-            TIPXDeferRelease(imageRef);
+            CMSampleBufferRef sample = NULL;
+            do {
+                sample = [output copyNextSampleBuffer];
+                TIPXDeferRelease(sample);
+                if (mod > 1 && ((++count % mod) != 1)) {
+                    continue;
+                }
 
-            if (imageRef) {
-                UIImage *image = [UIImage imageWithCGImage:imageRef];
-                if (image) {
+                CGImageRef imageRef = TIPX_CGImageCreateFromCMSampleBuffer(sample);
+                TIPXDeferRelease(imageRef);
+                if (imageRef) {
+                    UIImage *image = nil;
+                    if (TIPX_imageNeedsScaling(imageRef, naturalSize)) {
+                        if (!context) {
+                            context = [[CIContext alloc] init];
+                        }
+                        image = TIPX_scaledImage(imageRef, naturalSize, context);
+                    }
+                    if (!image) {
+                        image = [[UIImage alloc] initWithCGImage:imageRef];
+                    }
                     [images addObject:image];
                 }
-            }
-        } while (sample != NULL);
+            } while (sample != NULL);
 
         self->_frameCount = images.count;
 
@@ -497,4 +521,44 @@ static CGImageRef __nullable TIPX_CGImageCreateFromCMSampleBuffer(CMSampleBuffer
     return CGBitmapContextCreateImage(newContext);
 }
 
+static BOOL TIPX_imageNeedsScaling(CGImageRef imageRef, CGSize naturalSize)
+{
+    if (imageRef && CGImageGetWidth(imageRef) > 0 && CGImageGetHeight(imageRef) > 0) {
+        const CGFloat widthScale = naturalSize.width / CGImageGetWidth(imageRef);
+        const CGFloat heightScale = naturalSize.height / CGImageGetHeight(imageRef);
+
+        if (ABS(widthScale - 1) > kAdjustmentEpsilon || ABS(heightScale - 1) > kAdjustmentEpsilon) {
+            return YES;
+        }
+    }
+
+    return NO;
+}
+
+static UIImage *TIPX_scaledImage(CGImageRef imageRef, CGSize naturalSize, CIContext *context)
+{
+    CGImageRef finalImageRef = NULL;
+
+    @autoreleasepool {
+        if (imageRef) {
+            const CGFloat widthScale = naturalSize.width / CGImageGetWidth(imageRef);
+            const CGFloat heightScale = naturalSize.height / CGImageGetHeight(imageRef);
+
+            CIImage *ciimage = [CIImage imageWithCGImage:imageRef];
+            ciimage = [ciimage imageByApplyingTransform:CGAffineTransformMakeScale(widthScale, heightScale)];
+            CGImageRef scaledImageRef = [context createCGImage:ciimage fromRect:ciimage.extent];
+            if (scaledImageRef) {
+                finalImageRef = scaledImageRef;
+            }
+        }
+    }
+
+    if (finalImageRef) {
+        TIPXDeferRelease(finalImageRef);
+        return [UIImage imageWithCGImage:finalImageRef];
+    }
+
+    return nil;
+}
+
 NS_ASSUME_NONNULL_END

README.md

@@ -109,7 +109,7 @@ for a smaller image than the image in cache, no need to hit the network :)
 
 A great value that the _image pipeline_ offers is the ability to stream progressive scans of an
 image, if it is PJPEG, as the image is loaded from the Network.  This progressive rendering is
-natively supported by iOS 8+, but will not be supported in iOS 7 (the minimum OS for *TIP*).
+natively supported by iOS 8+, the same minimum OS for *TIP*.
 Progressive support is opt-in and also configurable in how scans should load.
 
 ### Resuming Image Downloads
@@ -153,6 +153,7 @@ image pipeline works.
         - Image response "Accept-Ranges" must be "bytes" and have "Last-Modified" header
         - Uses "Range" and "If-Range" headers to specify continuation
     - Pluggable networking (use your own network layer)
+        - Check out how to integrate [Twitter Network Layer](https://github.com/twitter/ios-twitter-network-layer) as your pluggable downloader with this [gist](https://gist.github.com/NSProgrammer/6e4c93ca9b9518178c9cbc7d950efd9c)
     - Custom hydration (useful for authenticated fetches)
 - Detailed insights
     - Global pipeline observability

TwitterImagePipeline.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name             = 'TwitterImagePipeline'
-  s.version          = '2.9.3'
+  s.version          = '2.10.0'
   s.summary          = 'Twitter Image Pipeline is a robust and performant image loading and caching framework for iOS'
   s.description      = 'Twitter created a framework for image loading/caching in order to fulfill the numerous needs of Twitter for iOS including being fast, safe, modular and versatile.'
   s.homepage         = 'https://github.com/twitter/ios-twitter-logging-service'
   s.license          = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
   s.author           = { 'Twitter' => 'opensource@twitter.com' }
   s.source           = { :git => 'https://github.com/twitter/ios-twitter-image-pipeline.git', :tag => s.version.to_s }
-  s.ios.deployment_target = '7.0'
+  s.ios.deployment_target = '8.0'
 
   s.subspec 'Default' do |sp|
     sp.source_files = 'TwitterImagePipeline/**/*'