| Chunk |
|---|
| Conflicting content |
|---|
private File mRenderPath;
private File mMediaTmp;
private MediaDesc mMediaDescTmp;
<<<<<<< HEAD
private MediaHelper mMediaHelper;
private MediaHelper.MediaResult mMediaResult;
=======
private MediaHelper mMediaHelper;
private MediaHelper.MediaResult mMediaResult;
>>>>>>> 686d122bd5373ffe3181ae6515c3ff80a07b717a
@Override
public void onCreate(Bundle savedInstanceState) { |
| Solution content |
|---|
private File mRenderPath;
private File mMediaTmp;
private MediaDesc mMediaDescTmp;
private MediaHelper mMediaHelper;
private MediaHelper.MediaResult mMediaResult;
@Override
public void onCreate(Bundle savedInstanceState) { |
| File |
|---|
| ProjectViewActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
//mMediaDescTmp.startTime = "00:00:01";
//mMediaDescTmp.duration = "00:00:01";
<<<<<<< HEAD
MediaDesc mediaOut = null;
if (mMediaDescTmp.mimeType.startsWith("image"))
mediaOut = prerenderImage(mMediaDescTmp);
else if (mMediaDescTmp.mimeType.startsWith("video"))
mediaOut = prerenderVideo(mMediaDescTmp, false);
else
mediaOut = prerenderVideo(mMediaDescTmp, true);
File fileMediaOut = new File(mediaOut.path);
Message msg = mHandler.obtainMessage(0);
mHandler.sendMessage(msg);
=======
MediaDesc mediaOut = prerenderMedia(mMediaDescTmp);
File fileMediaOut = new File(mediaOut.path);
Message msg = mHandler.obtainMessage(0);
mHandler.sendMessage(msg);
>>>>>>> 686d122bd5373ffe3181ae6515c3ff80a07b717a
if (fileMediaOut.exists() && fileMediaOut.length() > 0)
{
/* |
| Solution content |
|---|
//mMediaDescTmp.startTime = "00:00:01";
//mMediaDescTmp.duration = "00:00:01";
MediaDesc mediaOut = null;
if (mMediaDescTmp.mimeType.startsWith("image"))
mediaOut = prerenderImage(mMediaDescTmp);
else if (mMediaDescTmp.mimeType.startsWith("video"))
mediaOut = prerenderVideo(mMediaDescTmp, false);
else
mediaOut = prerenderVideo(mMediaDescTmp, true);
File fileMediaOut = new File(mediaOut.path);
Message msg = mHandler.obtainMessage(0);
mHandler.sendMessage(msg);
if (fileMediaOut.exists() && fileMediaOut.length() > 0)
{
/* |
| File |
|---|
| ProjectViewActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
<<<<<<< HEAD
private MediaDesc prerenderVideo (MediaDesc mediaIn, boolean preconvertMP4) throws Exception
=======
private MediaDesc prerenderMedia (MediaDesc mediaIn) throws Exception
>>>>>>> 686d122bd5373ffe3181ae6515c3ff80a07b717a
{
// DrawBoxVideoFilter vf = new DrawBoxVideoFilter(0,400,720,80,"red"); |
| Solution content |
|---|
}
private MediaDesc prerenderVideo (MediaDesc mediaIn, boolean preconvertMP4) throws Exception
{
// DrawBoxVideoFilter vf = new DrawBoxVideoFilter(0,400,720,80,"red"); |
| File |
|---|
| ProjectViewActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
FfmpegController ffmpegc = new FfmpegController (this);
<<<<<<< HEAD
File fileOutPath = createOutputFile("mp4");
MediaDesc mediaOut = ffmpegc.convertToMP4Stream(mediaIn, fileOutPath.getAbsolutePath(), preconvertMP4, new ShellCallback() {
=======
MediaDesc mediaOut = ffmpegc.convertToMP4Stream(mediaIn, new ShellCallback() {
>>>>>>> 686d122bd5373ffe3181ae6515c3ff80a07b717a
@Override
public void shellOut(String line) { |
| Solution content |
|---|
FfmpegController ffmpegc = new FfmpegController (this);
File fileOutPath = createOutputFile("mp4");
MediaDesc mediaOut = ffmpegc.convertToMP4Stream(mediaIn, fileOutPath.getAbsolutePath(), preconvertMP4, new ShellCallback() {
@Override
public void shellOut(String line) { |
| File |
|---|
| ProjectViewActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void onClick(View v) {
<<<<<<< HEAD
MediaDesc md = mediaList.get(pager.getCurrentItem()-1);
mMediaHelper.playMedia(new File(md.path), md.mimeType);
=======
>>>>>>> 686d122bd5373ffe3181ae6515c3ff80a07b717a
}
}); |
| Solution content |
|---|
@Override
public void onClick(View v) {
MediaDesc md = mediaList.get(pager.getCurrentItem()-1);
mMediaHelper.playMedia(new File(md.path), md.mimeType);
}
}); |
| File |
|---|
| ProjectViewActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return listProjectViews.get(position);
}
<<<<<<< HEAD
/**
* Remove a page for the given position. The adapter is responsible
* for removing the view from its container, although it only must ensure
* this is done by the time it returns from {@link #finishUpdate()}.
*
* @param container The containing View from which the page will be removed.
* @param position The page position to be removed.
* @param object The same object that was returned by
* {@link #instantiateItem(View, int)}.
*/
@Override
public void destroyItem(View collection, int position, Object view) {
((ViewPager) collection).removeView((View) view);
}
@Override
public boolean isViewFromObject(View view, Object object) {
return view==((View)object);
}
/**
* Called when the a change in the shown pages has been completed. At this
* point you must ensure that all of the pages have actually been added or
* removed from the container as appropriate.
* @param container The containing View which is displaying this adapter's
* page views.
*/
@Override
public void finishUpdate(View arg0) {}
=======
/**
* Remove a page for the given position. The adapter is responsible
* for removing the view from its container, although it only must ensure
* this is done by the time it returns from {@link #finishUpdate()}.
*
* @param container The containing View from which the page will be removed.
* @param position The page position to be removed.
* @param object The same object that was returned by
* {@link #instantiateItem(View, int)}.
*/
@Override
public void destroyItem(View collection, int position, Object view) {
((ViewPager) collection).removeView((View) view);
}
@Override
public boolean isViewFromObject(View view, Object object) {
return view==((View)object);
}
/**
* Called when the a change in the shown pages has been completed. At this
* point you must ensure that all of the pages have actually been added or
* removed from the container as appropriate.
* @param container The containing View which is displaying this adapter's
* page views.
*/
@Override
public void finishUpdate(View arg0) {}
>>>>>>> 686d122bd5373ffe3181ae6515c3ff80a07b717a
@Override
public void restoreState(Parcelable arg0, ClassLoader arg1) {}
|
| Solution content |
|---|
return listProjectViews.get(position);
}
/**
* Remove a page for the given position. The adapter is responsible
* for removing the view from its container, although it only must ensure
* this is done by the time it returns from {@link #finishUpdate()}.
*
* @param container The containing View from which the page will be removed.
* @param position The page position to be removed.
* @param object The same object that was returned by
* {@link #instantiateItem(View, int)}.
*/
@Override
public void destroyItem(View collection, int position, Object view) {
((ViewPager) collection).removeView((View) view);
}
@Override
public boolean isViewFromObject(View view, Object object) {
return view==((View)object);
}
/**
* Called when the a change in the shown pages has been completed. At this
* point you must ensure that all of the pages have actually been added or
* removed from the container as appropriate.
* @param container The containing View which is displaying this adapter's
* page views.
*/
@Override
public void finishUpdate(View arg0) {}
@Override
public void restoreState(Parcelable arg0, ClassLoader arg1) {}
|
| File |
|---|
| ProjectViewActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |