Commit 3b21c068c5cefdb1bd9a7be67bb9e77c8294a996
1 parent
51411380
更新短视频SDK,修改视频合成方法
Showing
3 changed files
with
8 additions
and
2 deletions
.idea/vcs.xml
0 → 100644
app/libs/libcnliveshortvideo.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/shortvideo/ui/activity/EditActivity.java
| @@ -685,7 +685,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On | @@ -685,7 +685,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On | ||
| 685 | } | 685 | } |
| 686 | String composeUrl = fileFolder + "/" + System.currentTimeMillis() + ".mp4"; | 686 | String composeUrl = fileFolder + "/" + System.currentTimeMillis() + ".mp4"; |
| 687 | Log.d(TAG, "compose Url:" + composeUrl); | 687 | Log.d(TAG, "compose Url:" + composeUrl); |
| 688 | - mEditKit.startCompose("test.mp4", "", composeUrl); | 688 | + mEditKit.startCompose(composeUrl); |
| 689 | } | 689 | } |
| 690 | 690 | ||
| 691 | } | 691 | } |
| @@ -938,7 +938,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On | @@ -938,7 +938,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On | ||
| 938 | mComposeAlertDialog.composeFinished(strings[0]); | 938 | mComposeAlertDialog.composeFinished(strings[0]); |
| 939 | mComposeFinished = true; | 939 | mComposeFinished = true; |
| 940 | } | 940 | } |
| 941 | - mEditKit.getUploadInfo(3, strings[0], mPutObjectResponseListener); | 941 | + mEditKit.getUploadInfo(strings[0],"title.mp4", "des", mPutObjectResponseListener); |
| 942 | } | 942 | } |
| 943 | case ShortVideoConstants.SHORTVIDEO_COMPOSE_ABORTED: | 943 | case ShortVideoConstants.SHORTVIDEO_COMPOSE_ABORTED: |
| 944 | break; | 944 | break; |