Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codeZP/SCRecorder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: rFlex/SCRecorder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 10 files changed
  • 7 contributors

Commits on May 23, 2016

  1. Update SCPlayer.m 

    Add observing of playback buffer and loaded time range for showing/hiding loading and knowing when to start playing again when paused by empty buffer
    @cerupcat
    cerupcat committed May 23, 2016
    Configuration menu
    Copy the full SHA
    0bc4df7 View commit details
    Browse the repository at this point in the history

  2. Update SCPlayer.h 

    Added new delegates for tracking playback buffer and loaded time ranges
    @cerupcat
    cerupcat committed May 23, 2016
    Configuration menu
    Copy the full SHA
    8b9a991 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Add video from camera roll to segments array 

    Mix between camera roll video and those taken from SCRecorder.
    @AnthoPakPak
    AnthoPakPak committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    bfafb39 View commit details
    Browse the repository at this point in the history

  2. Remove some crappy modifications

    @AnthoPakPak
    AnthoPakPak committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    4a3513b View commit details
    Browse the repository at this point in the history

  3. Fixes bad orientation with video from camera roll

    @AnthoPakPak
    AnthoPakPak committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    bc8b5a4 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. Fix in CIImage crop rect calculation in SCSwipeableFilterView

    @renjithn @rFlex
    renjithn authored and rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    5d8d9a0 View commit details
    Browse the repository at this point in the history

  2. occured -> occurred

    @rFlex
    unknown authored and rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    0ed0b25 View commit details
    Browse the repository at this point in the history

  3. happend -> happened

    @rFlex
    unknown authored and rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    98b1888 View commit details
    Browse the repository at this point in the history

  4. usefull -> useful

    @rFlex
    unknown authored and rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    c84553b View commit details
    Browse the repository at this point in the history

  5. Added "generic" type on segments of SCRecordSession.

    @rFlex
    rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    2c71b0b View commit details
    Browse the repository at this point in the history

  6. Fixed filter with overlayImage returning isEmpty. 

    Fixes rFlex#306
    @rFlex
    rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    944dfbe View commit details
    Browse the repository at this point in the history

  7. Changed thumbnail and lastImage in SCRecordSessionSegment to be weak … 

    …properties instead.
    @rFlex
    rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    3de563c View commit details
    Browse the repository at this point in the history

  8. Fixed player not being able to render video with a SCImageView attach… 

    …ed sometimes.
    @rFlex
    rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    8d3f740 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Workpop-master'

    @rFlex
    rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    d73e341 View commit details
    Browse the repository at this point in the history

  10. Added a way to have layoutIfNeeded called on the main thread for an o… 

    …verlayView in SCAssetExportSession.
    @rFlex
    rFlex committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    38ac99f View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2016

  1. Fixed SCImageView that didn't work when set directly on an SCRecorder… 

    … instance.
    @rFlex
    rFlex committed Aug 4, 2016
    Configuration menu
    Copy the full SHA
    0b9396e View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. Merge pull request rFlex#316 from AnthoPakPak/master 

    Add video from camera roll to segments array
    @rFlex
    rFlex authored Aug 26, 2016
    Configuration menu
    Copy the full SHA
    3f39b32 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. Exposing callbacks on when sample buffers are being given from the AV… 

    …CaptureSession.
    @scorsinsc
    scorsinsc committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    e8d9a3e View commit details
    Browse the repository at this point in the history

  2. Fixed typo.

    @scorsinsc
    scorsinsc committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    b7b922c View commit details
    Browse the repository at this point in the history
Loading